Merge branch 'topic/usb' into for-linus