Merge existing fixes from asoc/for-5.11

author Mark Brown <broonie@kernel.org>

Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 28 Dec 2020 12:24:15 +0000 (12:24 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history