Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 18:20:28 +0000 (19:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 18:20:28 +0000 (19:20 +0100)

Trivial merge