Merge branch 'topic/jack' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:43 +0000 (00:35 +0100)]
1  2 
include/linux/input.h
sound/core/jack.c

Simple merge
Simple merge