git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78c5c68 228d550)
Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c


Trivial merge
Pandora Kernel Repository