Merge remote-tracking branch 'spi/topic/of' into spi-next

author Mark Brown <broonie@kernel.org>

Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 21 Oct 2018 16:00:17 +0000 (17:00 +0100)
		1	2
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	blob \| history