Merge with mainline to remove plat-omap/Kconfig conflict