Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 10:10:17 +0000 (12:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 10:10:17 +0000 (12:10 +0200)

Trivial merge