Merge branch 'usb-linus' into usb-next