Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:46 +0000 (12:28 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:46 +0000 (12:28 +0000)

Trivial merge