Merge 3.10-rc6 into usb-next