Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic...

author Mark Brown <broonie@kernel.org>

Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-sh-msiof.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 10 Nov 2017 21:33:51 +0000 (21:33 +0000)
		1	2	3	4	5
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/spi-sh-msiof.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history