Merge remote-tracking branch 'jwb/next' into next
Benjamin Herrenschmidt [Fri, 22 Jul 2011 03:16:41 +0000 (13:16 +1000)]
1  2 
arch/powerpc/include/asm/mmu.h
arch/powerpc/kernel/setup_32.c
arch/powerpc/mm/tlb_nohash.c

Simple merge
Simple merge
Simple merge