Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 b3f35e5f9c95470c96dce361251c3c2275bc2207..057602d5555d6251b6251806929b064a18c1f2a7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -604,6 +604,13 @@ 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:  noswapaccount kernel command line parameter
 When:  2.6.40
 Why:   The original implementation of memsw feature enabled by