Merge branch 'omap-for-v4.10/fixes' into omap-for-v4.11/fixes