Merge 3.2-rc3 into usb-linus