Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 May 2010 14:50:00 +0000 (16:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 May 2010 14:50:00 +0000 (16:50 +0200)

Trivial merge