Merge branch 'spi-drivers' into spi-next

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

Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)

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

Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-pl022.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 22 Aug 2012 19:06:14 +0000 (20:06 +0100)
		1	2
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-pl022.c	patch \|	diff1 \|	diff2 \|	blob \| history