[NETFILTER]: ip_tables: remove obsolete SAME target

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8d5f9f8..0927425 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -249,15 +249,6 @@ Who:  Tejun Heo <htejun@gmail.com>
 
 ---------------------------
 
-What:  iptables SAME target
-When:  1.1. 2008
-Files: net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
-Why:   Obsolete for multiple years now, NAT core provides the same behaviour.
-       Unfixable broken wrt. 32/64 bit cleanness.
-Who:   Patrick McHardy <kaber@trash.net>
-
----------------------------
-
 What: The arch/ppc and include/asm-ppc directories
 When: Jun 2008
 Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64
@@ -315,3 +306,11 @@ Why:       This driver's functionality has been replaced by the
 Who:   John W. Linville <linville@tuxdriver.com>
 
 ---------------------------
+
+What:  iee80211 softmac wireless networking component
+When:  2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
+Files: net/ieee80211/softmac
+Why:   No in-kernel drivers will depend on it any longer.
+Who:   John W. Linville <linville@tuxdriver.com>
+
+---------------------------