Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 31 Jan 2011 11:00:17 +0000 (12:00 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 31 Jan 2011 11:00:17 +0000 (12:00 +0100)

Trivial merge