Merge branch 'topic/jack-mechanical' into to-push
authorTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
commita8022697811c3f2271df5ec14fa6f518b731b46a
treed94522dec3c3008d6e204ac5266888d5997b2368
parenta65056205cdf7efb96fb2558e4f1ec6bae2582ed
parentcdc693643271b2e6a693cf8f6afb258cce01f058
Merge branch 'topic/jack-mechanical' into to-push
include/linux/input.h
sound/core/jack.c