[LinuxPPS] 3 Aug 22:16 - Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linuxpps: Linus Torvalds <>]

Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc  
  
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:  
[POWERPC] Fixes for the SLB shadow buffer code  
[POWERPC] Fix a compile warning in powermac/feature.c  
[POWERPC] Fix a compile warning in pci_32.c  
[POWERPC] Fix parse_drconf_memory() for 64-bit start addresses  
[POWERPC] Fix num_cpus calculation in smp_call_function_map()  
[POWERPC] ps3: Fix section mismatch in ps3/setup.c  
[POWERPC] spufs: Fix affinity after introduction of node_allowed() calls  
[POWERPC] Fix special PTE code for secondary hash bucket  
[POWERPC] Expand RPN field to 34 bits when using 64k pages  
  
arch/powerpc/kernel/entry_64.S  
arch/powerpc/kernel/pci_32.c  
arch/powerpc/kernel/smp.c  
arch/powerpc/mm/hash_low_64.S  
arch/powerpc/mm/hash_utils_64.c  
arch/powerpc/mm/numa.c  
arch/powerpc/mm/slb.c  
arch/powerpc/platforms/cell/spufs/sched.c  
arch/powerpc/platforms/powermac/feature.c  
arch/powerpc/platforms/ps3/setup.c  
include/asm-powerpc/mmu-hash64.h  
include/asm-powerpc/pgtable-64k.h

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=22da317629bad23816f3fa26d657fb46e7af21c7