git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28a51ba cc4fc02)
Merge branch 'connlimit' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 09:33:55 +0000 (10:33 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 20 Jan 2011 09:33:55 +0000 (10:33 +0100)
Conflicts:
Documentation/feature-removal-schedule.txt

Signed-off-by: Patrick McHardy <kaber@trash.net>

Trivial merge
Pandora Kernel Repository