From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 12 Jun 2009 18:03:13 +0000 (+0200)
Subject: Merge branch 'topic/misc' into for-linus
X-Git-Tag: v2.6.31-rc1~363^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=be914cf91086ca7be9216a894cba0999ddbf541d;p=linux.git

Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: use card device as parent for jack input-devices
---

be914cf91086ca7be9216a894cba0999ddbf541d