Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 1 Apr 2011 16:01:57 +0000 (18:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 1 Apr 2011 16:01:57 +0000 (18:01 +0200)

Trivial merge