Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[karo-tx-linux.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d6f5255ca54780f2aa8982445a15809a31ccd90c..a9c4245e2fd873d89268dcda6e8c632f55e66567 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -637,3 +637,12 @@ Why:       The original implementation of memsw feature enabled by
 Who:   Michal Hocko <mhocko@suse.cz>
 
 ----------------------------
+
+What:  ipt_addrtype match include file
+When:  2012
+Why:   superseded by xt_addrtype
+Who:   Florian Westphal <fw@strlen.de>
+Files: include/linux/netfilter_ipv4/ipt_addrtype.h
+>>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04
+
+----------------------------