[PATCH] Make initramfs printk a warning on incorrect cpio type

[linux-2.6] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 82447163a0c25ffa6ffc2b1424a43f5603722ba4..226ecf2ffd568158a2927b24e27e21bde00b6d30 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -234,10 +234,11 @@ Who:      Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
-What:  ftape
-When:  2.6.20
-Why:   Orphaned for ages.  SMP bugs long unfixed.  Few users left
-       in the world.
-Who:   Jeff Garzik <jeff@garzik.org>
+What:  IPv4 only connection tracking/NAT/helpers
+When:  2.6.22
+Why:   The new layer 3 independant connection tracking replaces the old
+       IPv4 only version. After some stabilization of the new code the
+       old one will be removed.
+Who:   Patrick McHardy <kaber@trash.net>
 
 ---------------------------