Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2