Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 08:50:16 +0000 (09:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 08:50:16 +0000 (09:50 +0100)

Trivial merge