Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 11 Jun 2010 16:09:27 +0000 (18:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 11 Jun 2010 16:09:27 +0000 (18:09 +0200)

Trivial merge