]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
sound/usb/caiaq/caiaq-device.c

Simple merge