Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 18 Mar 2011 06:39:08 +0000 (07:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 18 Mar 2011 06:39:08 +0000 (07:39 +0100)

Trivial merge