Merge commit 'origin' into master

Manual merge of:

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

diff --cc arch/powerpc/Kconfig
index bbe149c,9391199..369d93e
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -19,6 -19,12 +19,9 @@@ config WORD_SIZ
        default 64 if PPC64
        default 32 if !PPC64
  
 -config PPC_MERGE
 -      def_bool y
 -
+ config ARCH_PHYS_ADDR_T_64BIT
+        def_bool PPC64 || PHYS_64BIT
+ 
  config MMU
        bool
        default y

diff --cc arch/powerpc/include/asm/page.h
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/sputrace.c
Simple merge