]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commita02efb906d12c9d4eb2ab7c59049ba9545e5412d
treebf1f6467978ec63a22f42299ecac2ee7f7e73336
parent84dfcb4b318463cd4883b6a19937824f49aee564
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4
Merge commit 'origin' into master

Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
arch/powerpc/platforms/cell/spufs/sputrace.c