Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 1 Jun 2020 12:01:13 +0000 (13:01 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Jun 2020 12:01:13 +0000 (13:01 +0100)

Trivial merge