Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 14 Apr 2011 10:09:30 +0000 (12:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 14 Apr 2011 10:09:30 +0000 (12:09 +0200)

Trivial merge