Merge branch 'next/fixes-non-critical' into HEAD

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-ux500/Kconfig
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu.c
Simple merge

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

diff --cc drivers/tty/serial/mpc52xx_uart.c
Simple merge

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