Merge remote-tracking branch 'spi/for-5.12' into spi-next

author Mark Brown <[email protected]>

Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)

committer Mark Brown <[email protected]>

Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)
author Mark Brown <[email protected]>
Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)
committer Mark Brown <[email protected]>
Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)
committer	Mark Brown <[email protected]>
	Fri, 12 Feb 2021 14:00:22 +0000 (14:00 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history