From: Patrick McHardy <kaber@trash.net>
Date: Thu, 20 Jan 2011 09:33:55 +0000 (+0100)
Subject: Merge branch 'connlimit' of git://dev.medozas.de/linux
X-Git-Tag: v2.6.39-rc1~468^2~510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82d800d8e7fa731b50deb851d16b68050673f587;p=platform%2Fkernel%2Flinux-3.10.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt

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

82d800d8e7fa731b50deb851d16b68050673f587
diff --cc Documentation/feature-removal-schedule.txt
index 8c594c4,45cc804..05b248a
--- a/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
+ 
+ ----------------------------