Merge remote-tracking branch 'galak/next'

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/dma-swiotlb.c
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64e.S
Simple merge

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

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