Merge commit 'gcl/next' into next

diff --cc arch/powerpc/Kconfig
Simple merge

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

diff --cc arch/powerpc/kernel/crash_dump.c
Simple merge

diff --cc arch/powerpc/kernel/machine_kexec.c
Simple merge

diff --cc arch/powerpc/kernel/paca.c
Simple merge

diff --cc arch/powerpc/kernel/rtas.c
Simple merge

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge