Merge branch 'topic/jack' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:43 +0000 (00:35 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:43 +0000 (00:35 +0100)
commit5b56eec77498f15317f3ff5ac9101372f400c859
tree1acfb40ca6a19323a292131aa7fca68ef4ef330b
parentc2f43981e5dbc92884149aa2234064cc2c340acd
parent662c319ae4b4fb60001816dfe1dde5fdfc7a2af9
Merge branch 'topic/jack' into for-linus
include/linux/input.h
sound/core/jack.c