Merge 3.15-rc5 into usb-next