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