Merge branch 'omap-for-v4.3/fixes' into for-next