Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:35 +0000 (12:43 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:35 +0000 (12:43 +0000)

Trivial merge