Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/xcomm' and 'spi/topic...

author Mark Brown <broonie@kernel.org>

Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)

committer Mark Brown <broonie@kernel.org>

Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)
author Mark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)
committer Mark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 31 Aug 2015 13:45:45 +0000 (14:45 +0100)
		1	2	3	4
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history