Merge branches 'spi-drivers' and 'spi-mxs' into spi-next

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
		1	2	3
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history