Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 10 Apr 2010 19:35:53 +0000 (21:35 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 10 Apr 2010 19:35:53 +0000 (21:35 +0200)

Trivial merge