Merge branch 'fix/caiaq' into for-linus
Takashi Iwai [Thu, 2 Jul 2009 15:48:32 +0000 (17:48 +0200)]
* fix/caiaq:
  ALSA: usx2y - reparent sound device
  ALSA: snd_usb_caiaq: reparent sound device


Trivial merge