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

author Mark Brown <[email protected]>

Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)

committer Mark Brown <[email protected]>

Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)
author Mark Brown <[email protected]>
Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)
committer Mark Brown <[email protected]>
Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-topology.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)
committer	Mark Brown <[email protected]>
	Fri, 11 Dec 2020 17:47:52 +0000 (17:47 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-topology.c	patch \|	diff1 \|	diff2 \|	blob \| history