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

author Mark Brown <broonie@kernel.org>

Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)
diff --cc drivers/spi/spi-stm32-qspi.c
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 25 Jun 2021 13:08:26 +0000 (14:08 +0100)
		1	2
drivers/spi/spi-stm32-qspi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history