Merge commit 'jwb/next' into next

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

diff --cc arch/powerpc/kernel/head_booke.h
Simple merge