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