]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'alsa/devel' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000 (11:27 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000 (11:27 +0100)
commit6dd5832da770b4dda4c4f3924b2ede61c219a081
tree5ae1fee7169edd9bebace22394f0777af21fca63
parenteb88bc23f1e1c857ef672df772d21415a2f9bb7f
parent62c60093325e7db622ce57cf90b3b87f09355e0f
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