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

Trivial merge