Merge branch 'topic/usb-caiaq' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 12 Jan 2009 13:06:01 +0000 (14:06 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 12 Jan 2009 13:06:01 +0000 (14:06 +0100)

Trivial merge