Merge remote-tracking branches 'spi/topic/adi', 'spi/topic/atmel', 'spi/topic/cadence...

author Mark Brown <broonie@linaro.org>

Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)

committer Mark Brown <broonie@linaro.org>

Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)
author Mark Brown <broonie@linaro.org>
Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)
committer Mark Brown <broonie@linaro.org>
Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-atmel.c
Simple merge
diff --cc drivers/spi/spi-fsl-espi.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)
committer	Mark Brown <broonie@linaro.org>
	Tue, 20 May 2014 22:28:12 +0000 (23:28 +0100)
		1	2	3	4	5	6	7
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/spi/spi-atmel.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/spi/spi-fsl-espi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history