Merge branch 'omap-for-v4.20/defconfig' into omap-for-v4.21/defconfig