Merge branch 'asoc-5.4' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 22 Nov 2019 19:55:59 +0000 (19:55 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 22 Nov 2019 19:55:59 +0000 (19:55 +0000)

Trivial merge