Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx-hsspi', 'spi...

author Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)

committer Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)
author Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)
committer Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/spi-sh-msiof.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)
committer	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 12:53:13 +0000 (12:53 +0000)
		1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	diff12 \|	diff13 \|	diff14 \|	diff15 \|	diff16 \|	diff17 \|	diff18 \|	diff19 \|	blob \| history
drivers/spi/spi-sh-msiof.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	diff12 \|	diff13 \|	diff14 \|	diff15 \|	diff16 \|	diff17 \|	diff18 \|	diff19 \|	blob \| history