Merge 3.12-rc6 into usb-next.