Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 23 Apr 2021 18:01:00 +0000 (19:01 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 23 Apr 2021 18:01:00 +0000 (19:01 +0100)

Trivial merge