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

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

Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)

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

Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
		1	2
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history