Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 8 Feb 2011 07:36:32 +0000 (08:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 8 Feb 2011 07:36:32 +0000 (08:36 +0100)

Trivial merge