Merge branch 'topic/usb-caiaq' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:23 +0000 (00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:23 +0000 (00:36 +0100)
commitc441c2971de52b7045acb708cc9959815f554f66
tree909be321dd72292c3fcd6479077aaa2c99ae54c4
parentafad17c0ae21013f958c39594e8a64d120a611f8
parent28514fe5bbbdbc0f7c9700569378d55cafd061ea
Merge branch 'topic/usb-caiaq' into for-linus
sound/usb/caiaq/caiaq-device.c