Merge remote branch 'alsa/devel' into topic/misc
commit156366d31524dc6b88836f06dccb1be13dbef5f1
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000 (2 11:27 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000 (2 11:27 +0100)
tree5ae1fee7169edd9bebace22394f0777af21fca63
parent7f9320d415fab5c05097c77eea7a77f2f6341f24
parent0a566ec25627bdd360f7294aa2e52f9d121233b4
Merge remote branch 'alsa/devel' into topic/misc

Conflicts:
sound/usb/usbaudio.c
sound/usb/usbaudio.c
sound/usb/usbaudio.h
sound/usb/usbquirks.h