Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 30 Aug 2021 11:30:33 +0000 (12:30 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 30 Aug 2021 11:30:33 +0000 (12:30 +0100)

Trivial merge