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

author Mark Brown <broonie@linaro.org>

Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)
diff --cc drivers/spi/spi-au1550.c
Simple merge
diff --cc drivers/spi/spi-txx9.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 25 Oct 2013 08:51:36 +0000 (09:51 +0100)
		1	2
drivers/spi/spi-au1550.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-txx9.c	patch \|	diff1 \|	diff2 \|	blob \| history