Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge

diff --cc arch/arm/mach-imx/clk-imx25.c
Simple merge

diff --cc arch/arm/mach-imx/clk-imx27.c
Simple merge

diff --cc arch/arm/mach-imx/devices/platform-mxc-mmc.c
Simple merge

diff --cc arch/arm/mach-imx/mm-imx3.c
Simple merge

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

diff --cc drivers/mmc/host/mxcmmc.c
Simple merge