Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Jan 2011 07:37:14 +0000 (08:37 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 13 Jan 2011 07:37:14 +0000 (08:37 +0100)

Trivial merge