Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Feb 2011 17:53:53 +0000 (18:53 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Feb 2011 17:53:53 +0000 (18:53 +0100)

Trivial merge