be914cf91086ca7be9216a894cba0999ddbf541d - linux - Git at Google

commit: be914cf91086ca7be9216a894cba0999ddbf541d
[log]
author: Takashi Iwai <tiwai@suse.de>
Fri Jun 12 20:03:13 2009 +0200
committer: Takashi Iwai <tiwai@suse.de>
Fri Jun 12 20:03:13 2009 +0200
tree: f4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21
parent: 31d496aaee1dad6ac63770035793032f2062e336 [diff]
parent: 1f3fff7bda95b75a6be5a02c2a6902573d8c18e6 [diff]

Merge branch 'topic/misc' into for-linus

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

tree: f4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21