Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / sound / usb / mixer_maps.c
2010-05-31 Daniel MackALSA: usb-audio: unify constants from specification
2010-03-12 Daniel MackALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch]