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

Trivial merge