Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Nov 2011 18:52:08 +0000 (19:52 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Nov 2011 18:52:08 +0000 (19:52 +0100)

Trivial merge