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

author Mark Brown <broonie@linaro.org>

Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)

committer Mark Brown <broonie@linaro.org>

Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-atmel.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +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
drivers/spi/spi-atmel.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history