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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82d800d8e7fa731b50deb851d16b68050673f587;p=pandora-kernel.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
Reading git-diff-tree failed