Merge branch 'omap/usb' into next/dt2