Merge v5.11-rc3

author Mark Brown <broonie@kernel.org>

Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 13 Jan 2021 17:57:11 +0000 (17:57 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history