Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 21 May 2010 15:13:17 +0000 (17:13 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 May 2010 15:13:17 +0000 (17:13 +0200)

Trivial merge