Merge branch 'v2.6.29-usb'