Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next

author Mark Brown <broonie@kernel.org>

Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)

committer Mark Brown <broonie@kernel.org>

Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)
author Mark Brown <broonie@kernel.org>
Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)
committer Mark Brown <broonie@kernel.org>
Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)
committer	Mark Brown <broonie@kernel.org>
	Thu, 4 Jul 2019 16:35:11 +0000 (17:35 +0100)
		1	2
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	blob \| history