Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 Jun 2010 15:08:41 +0000 (17:08 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Jun 2010 15:08:41 +0000 (17:08 +0200)

Trivial merge