Merge branch 'omap-for-v4.11/omap1' into omap-for-v4.11/soc