Merge branch 'fix/caiaq' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 26 Jul 2009 09:07:04 +0000 (11:07 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 26 Jul 2009 09:07:04 +0000 (11:07 +0200)
* fix/caiaq:
  ALSA: snd_usb_caiaq: add support for Audio2DJ


Trivial merge