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