Merge branch 'topic/usbaudio' into for-linus