Merge branch 'connlimit' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Wed, 26 Jan 2011 15:28:45 +0000 (16:28 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 26 Jan 2011 15:28:45 +0000 (16:28 +0100)

Trivial merge