Merge 3.0-rc2 into usb-linus as it's needed by some USB patches