Skip to content
Commit be914cf9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus 

* topic/misc:
  ALSA: use card device as parent for jack input-devices
parents 31d496aa 1f3fff7b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment