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