summaryrefslogtreecommitdiff
path: root/pfinet/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'pfinet/ChangeLog')
-rw-r--r--pfinet/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog
index 4bf8d70d..a7ba685f 100644
--- a/pfinet/ChangeLog
+++ b/pfinet/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-05 Roland McGrath <roland@baalperazim.frob.com>
+
+ * linux-src (many files): Merge Linux 2.2.13 and 2.2.14 code.
+ * glue-include/linux/mm.h (PAGE_SIZE, num_physpages): New macros.
+ (__get_free_pages): New inline function.
+
2000-02-04 Roland McGrath <roland@baalperazim.frob.com>
* options.c (parse_opt): New code to set the default gateway using