Merge branch 'topic/core-fixes' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 9 Feb 2016 22:08:37 +0000 (23:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 9 Feb 2016 22:08:37 +0000 (23:08 +0100)

Trivial merge