Merge branch 'topic/jack' into for-linus
Takashi Iwai [Thu, 20 May 2010 09:59:37 +0000 (11:59 +0200)]
1  2 
sound/core/jack.c

Simple merge