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)
commit29769d533bc7c1429601272b6dd88d4212125e8e
tree8c1cbbd60f1bf8a7f69f67d45e3dfd6333256f30
parent7679d5c65ba8e4d27daa9181c2f4c7e618058f29
parentb30c4947735f9d76da3d194923efd38ed18ad651
Merge branch 'fix/caiaq' into for-linus

* fix/caiaq:
  ALSA: snd_usb_caiaq: add support for Audio2DJ