Merge branch 'asoc-4.22' into asoc-5.0
authorMark Brown <broonie@kernel.org>
Mon, 7 Jan 2019 12:18:14 +0000 (12:18 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 7 Jan 2019 12:18:14 +0000 (12:18 +0000)

Trivial merge