Merge branch 'topic/usb-audio' into for-linus
[pandora-kernel.git] / sound / usb / usbmixer.c
Simple merge