Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 22 Jul 2011 03:16:41 +0000 (13:16 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 22 Jul 2011 03:16:41 +0000 (13:16 +1000)
commit4b575f3e8aba07688fc48025efde41036e5d5eee
tree4bbccce83e80af179500be45f9e8080315f5e32e
parentf7723f0eaf53d51ee54374116b25ac33e0be8542
parenta8e616b9a41212655042f59c969f30bb7de1ec73
Merge remote-tracking branch 'jwb/next' into next
arch/powerpc/include/asm/mmu.h
arch/powerpc/kernel/setup_32.c
arch/powerpc/mm/tlb_nohash.c