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)
* topic/misc:
  ALSA: use card device as parent for jack input-devices


Trivial merge