Merge branch 'topic/misc' into for-linus
Takashi Iwai [Mon, 8 Mar 2010 08:35:50 +0000 (09:35 +0100)]

Trivial merge