Merge existing fixes from asoc/for-5.17 into new branch
authorMark Brown <broonie@kernel.org>
Mon, 24 Jan 2022 13:30:47 +0000 (13:30 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 24 Jan 2022 13:30:47 +0000 (13:30 +0000)

Trivial merge