Merge branch 'topic/jack-mechanical' into to-push

author Takashi Iwai <tiwai@suse.de>

Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)

committer Takashi Iwai <tiwai@suse.de>

Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
author Takashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
committer Takashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
diff --cc include/linux/input.h
Simple merge
diff --cc sound/core/jack.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 25 Dec 2008 10:40:29 +0000 (11:40 +0100)
		1	2
include/linux/input.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/jack.c	patch \|	diff1 \|	diff2 \|	blob \| history