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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/bios32.c
Simple merge

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

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

diff --cc drivers/gpio/gpio-omap.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

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

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

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge