Merge branch 'topic/jack-mechanical' into to-push
Takashi Iwai [Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)]
1  2 
include/linux/input.h
sound/core/jack.c

Simple merge
Simple merge