Merge 3.14-rc6 into usb-next

We want the USB fixes in here as well.