Merge commit 'origin/master' into next

author Benjamin Herrenschmidt <benh@kernel.crashing.org>

Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)

committer Benjamin Herrenschmidt <benh@kernel.crashing.org>

Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
author Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
committer Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
diff --cc arch/powerpc/include/asm/cputable.h
Simple merge
diff --cc arch/powerpc/kernel/head_32.S
Simple merge
diff --cc arch/powerpc/platforms/ps3/Kconfig
Simple merge
author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
		1	2
arch/powerpc/include/asm/cputable.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/head_32.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/ps3/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history