Merge remote branch 'alsa/devel' into topic/misc
Takashi Iwai [Tue, 2 Mar 2010 10:27:46 +0000 (11:27 +0100)]
Conflicts:
sound/usb/usbaudio.c

1  2 
sound/usb/usbaudio.c
sound/usb/usbaudio.h
sound/usb/usbquirks.h

Simple merge
Simple merge
Simple merge