aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-12 14:03:13 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-12 14:03:13 -0400
commitbe914cf91086ca7be9216a894cba0999ddbf541d (patch)
treef4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21 /include/linux
parent31d496aaee1dad6ac63770035793032f2062e336 (diff)
parent1f3fff7bda95b75a6be5a02c2a6902573d8c18e6 (diff)
Merge branch 'topic/misc' into for-linus
* topic/misc: ALSA: use card device as parent for jack input-devices
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions