From: Patrick McHardy Date: Wed, 26 Jan 2011 15:28:45 +0000 (+0100) Subject: Merge branch 'connlimit' of git://dev.medozas.de/linux X-Git-Tag: v2.6.39-rc1~468^2~443^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2e0348c449683a837644bb0027dbe5940b150c25;p=users%2Fjedix%2Flinux-maple.git Merge branch 'connlimit' of git://dev.medozas.de/linux --- 2e0348c449683a837644bb0027dbe5940b150c25