Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 May 2010 18:24:23 +0000 (20:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 May 2010 18:24:23 +0000 (20:24 +0200)

Trivial merge