Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 27 May 2011 06:02:59 +0000 (08:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 May 2011 06:02:59 +0000 (08:02 +0200)

Trivial merge