Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2010 14:55:26 +0000 (16:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2010 14:55:26 +0000 (16:55 +0200)

Trivial merge