Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 12 Jan 2012 08:59:14 +0000 (09:59 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 12 Jan 2012 08:59:14 +0000 (09:59 +0100)

Trivial merge