Merge remote branch 'alsa/devel' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Feb 2010 09:42:38 +0000 (10:42 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Feb 2010 09:42:38 +0000 (10:42 +0100)
1  2 
sound/usb/usbmixer.c

Simple merge