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)
commit2e0348c449683a837644bb0027dbe5940b150c25
tree17152612e7ec1844b46c36565d56297a00b112b1
parent9f4e1ccd80530609bbceec68ae3831697b5c6a68
parentad86e1f27a9a97a9e50810b10bca678407b1d6fd
Merge branch 'connlimit' of git://dev.medozas.de/linux