Merge branch 'fix/caiaq' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:32 +0000 (17:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:32 +0000 (17:48 +0200)
commitcfbc78003e2b12e60a1d594ce192c30aea44eb2a
tree03c650f0f144f81b21a93b5278daa36dc2cc6c50
parentdc8a4f3fc3c32954c9fd46cb027b959380be2d65
parent3f5d3465be8f6e04f43d9b6d543fe28d4be07d78
Merge branch 'fix/caiaq' into for-linus

* fix/caiaq:
  ALSA: usx2y - reparent sound device
  ALSA: snd_usb_caiaq: reparent sound device