Merge branch 'topic/usb-fix' into for-linus