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