Merge branch 'connlimit' of git://dev.medozas.de/linux

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --cc Documentation/feature-removal-schedule.txt
index 8c594c45b6a178c5efa49b671473abfde5e98204,45cc8044dad66acc4d13289b162da8135454e178..05b248aa91f155cee7440ff8034857c196c6ab26
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -602,12 -577,9 +602,19 @@@ Who:     Tejun Heo <tj@kernel.org
  
  ----------------------------
  
 +What: Legacy, non-standard chassis intrusion detection interface.
 +When: June 2011
 +Why:  The adm9240, w83792d and w83793 hardware monitoring drivers have
 +      legacy interfaces for chassis intrusion detection. A standard
 +      interface has been added to each driver, so the legacy interface
 +      can be removed.
 +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
+ 
+ ----------------------------