Merge remote-tracking branch 'spi/topic/dspi' into spi-next

author Mark Brown <broonie@linaro.org>

Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)

committer Mark Brown <broonie@linaro.org>

Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
author Mark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
committer Mark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
author	Mark Brown <broonie@linaro.org>
	Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
committer	Mark Brown <broonie@linaro.org>
	Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
		1	2
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history