Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 Apr 2011 16:23:14 +0000 (18:23 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 28 Apr 2011 16:23:14 +0000 (18:23 +0200)

Trivial merge