Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus

author Mark Brown <broonie@kernel.org>

Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-topology.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 9 Oct 2020 14:42:29 +0000 (15:42 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-topology.c	patch \|	diff1 \|	diff2 \|	blob \| history