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

diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usbmixer.c
Simple merge
diff --cc sound/usb/usbquirks.h
Simple merge
		1	2
sound/usb/usbaudio.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbmixer.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbquirks.h	patch \|	diff1 \|	diff2 \|	blob \| history