Merge branch 'connlimit' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 09:33:55 +0000 (10:33 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 09:33:55 +0000 (10:33 +0100)
commit82d800d8e7fa731b50deb851d16b68050673f587
tree60acee6699b1cdb7fe5e2802947737dffeeeb6c9
parent28a51ba59a1a983d63d4775e9bb8230fe0fb3b29
parentcc4fc022571376412986e27e08b0765e9cb2aafb
Merge branch 'connlimit' of git://dev.medozas.de/linux

Conflicts:
Documentation/feature-removal-schedule.txt

Signed-off-by: Patrick McHardy <kaber@trash.net>
Documentation/feature-removal-schedule.txt