git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7066f7 6faee60)
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Fri, 14 Jan 2011 13:12:37 +0000 (14:12 +0100)
committerPatrick McHardy <kaber@trash.net>
Fri, 14 Jan 2011 13:12:37 +0000 (14:12 +0100)
Conflicts:
net/ipv4/route.c

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

Trivial merge
Pandora Kernel Repository