Merge branch 'spi-5.7' into spi-next

author Mark Brown <broonie@kernel.org>

Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 27 Mar 2020 15:53:00 +0000 (15:53 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history