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

This commit is contained in:
Patrick McHardy 2011-01-26 16:28:45 +01:00
commit 2e0348c449