Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 1 Jun 2010 05:45:20 +0000 (07:45 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 1 Jun 2010 05:45:20 +0000 (07:45 +0200)

Trivial merge