Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 8 Jun 2010 14:53:21 +0000 (16:53 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 8 Jun 2010 14:53:21 +0000 (16:53 +0200)

Trivial merge