git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84dfcb4 2515ddc)
Merge commit 'origin' into master
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000 (15:52 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000 (15:52 +1100)
Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h


Trivial merge
Pandora Kernel Repository