Merge branch 'omap-for-v4.4/omap5' into for-next