Merge branch 'omap-upstream' into for-next