git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee673ea 8acd3a6)
Merge commit 'origin'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
Manual fixup of conflicts on:

arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h


Trivial merge
Pandora Kernel Repository