Merge branch 'topic/jack' into for-linus
Takashi Iwai [Sun, 18 Mar 2012 17:22:50 +0000 (18:22 +0100)]

Trivial merge