Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 25 Mar 2011 18:23:54 +0000 (19:23 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 25 Mar 2011 18:23:54 +0000 (19:23 +0100)

Trivial merge