Merge 2.6.39-rc4 into usb-next