summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-11 12:56:14 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-11 12:56:14 -0700
commit67da25521066b38911701efa133aaad2238b5530 (patch)
tree776ad4942ce8294f0ba0013baf9527a1d39b424f /Documentation
parent7b34ca2ac7063f4ebf07f85fd75253ed84d5c648 (diff)
parent2597a8344ce051d0afe331706bcb4660bbdb9861 (diff)
downloadlinux-67da25521066b38911701efa133aaad2238b5530.tar.bz2
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt22
1 files changed, 7 insertions, 15 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 56000b33340b..bc4b9c6eb80e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -414,21 +414,6 @@ Who: Jean Delvare <khali@linux-fr.org>
----------------------------
-What: xt_connlimit rev 0
-When: 2012
-Who: Jan Engelhardt <jengelh@medozas.de>
-Files: net/netfilter/xt_connlimit.c
-
-----------------------------
-
-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
-
-----------------------------
-
What: i2c_driver.attach_adapter
i2c_driver.detach_adapter
When: September 2011
@@ -589,6 +574,13 @@ Why: Remount currently allows changing bound subsystems and
----------------------------
+What: xt_recent rev 0
+When: 2013
+Who: Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+
+----------------------------
+
What: KVM debugfs statistics
When: 2013
Why: KVM tracepoints provide mostly equivalent information in a much more