Merge 3.15-rc3 into usb-next