Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 14 Feb 2011 21:51:46 +0000 (22:51 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 14 Feb 2011 21:51:46 +0000 (22:51 +0100)

Trivial merge