Merge 3.0-rc2 + Linus's latest into usb-linus