summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-20 10:33:55 +0100
committerPatrick McHardy <kaber@trash.net>2011-01-20 10:33:55 +0100
commit82d800d8e7fa731b50deb851d16b68050673f587 (patch)
tree60acee6699b1cdb7fe5e2802947737dffeeeb6c9 /Documentation
parent28a51ba59a1a983d63d4775e9bb8230fe0fb3b29 (diff)
parentcc4fc022571376412986e27e08b0765e9cb2aafb (diff)
downloadlinux-82d800d8e7fa731b50deb851d16b68050673f587.tar.bz2
Merge branch 'connlimit' of git://dev.medozas.de/linux
Conflicts: Documentation/feature-removal-schedule.txt Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8c594c45b6a1..05b248aa91f1 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -611,3 +611,10 @@ Why: The adm9240, w83792d and w83793 hardware monitoring drivers have
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
+
+----------------------------