Merge branch 'omap1-usb-fix' into omap-for-v4.21/omap1