Merge branch 'topic/core-fixes' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 Feb 2016 13:52:41 +0000 (14:52 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Feb 2016 13:52:41 +0000 (14:52 +0100)

Trivial merge