Merge branch 'fix/misc' into for-linus
Takashi Iwai [Thu, 10 Nov 2011 18:52:08 +0000 (19:52 +0100)]

Trivial merge