Merge remote-tracking branches 'spi/topic/fsl-lpspi', 'spi/topic/imx', 'spi/topic...

author Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +0000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:54:14 +0000 (15:54 +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