Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 15 Jun 2010 10:24:05 +0000 (12:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 15 Jun 2010 10:24:05 +0000 (12:24 +0200)

Trivial merge