From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 2 Jul 2009 15:48:32 +0000 (+0200)
Subject: Merge branch 'fix/caiaq' into for-linus
X-Git-Tag: v2.6.31-rc2~6^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfbc78003e2b12e60a1d594ce192c30aea44eb2a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'fix/caiaq' into for-linus

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

cfbc78003e2b12e60a1d594ce192c30aea44eb2a