Merge remote-tracking branch 'arm/for-next'

diff --cc arch/arm/common/mcpm_entry.c
Simple merge

diff --cc arch/arm/include/asm/Kbuild
Simple merge

diff --cc arch/arm/include/asm/mcpm.h
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc drivers/dma/edma.c
Simple merge

diff --cc drivers/of/platform.c
Simple merge