Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:13 +0000 (20:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:13 +0000 (20:03 +0200)
commitbe914cf91086ca7be9216a894cba0999ddbf541d
treef4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21
parent31d496aaee1dad6ac63770035793032f2062e336
parent1f3fff7bda95b75a6be5a02c2a6902573d8c18e6
Merge branch 'topic/misc' into for-linus

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