Merge remote-tracking branches 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi...

author Mark Brown <broonie@linaro.org>

Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)

committer Mark Brown <broonie@linaro.org>

Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)
author Mark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)
committer Mark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-xilinx.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)
committer	Mark Brown <broonie@linaro.org>
	Sun, 30 Mar 2014 00:51:48 +0000 (00:51 +0000)
		1	2	3
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/spi/spi-xilinx.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history