Merge 3.2-rc1 into usb-linus