Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 18 Dec 2009 19:32:06 +0000 (20:32 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 18 Dec 2009 19:32:06 +0000 (20:32 +0100)

Trivial merge