Merge branch 'connlimit' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 13:17:32 +0000 (14:17 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 13:17:32 +0000 (14:17 +0100)

Trivial merge