Merge branch 'omap-for-v5.6/fixes-rc2' into fixes