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

author Mark Brown <[email protected]>

Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)

committer Mark Brown <[email protected]>

Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
author Mark Brown <[email protected]>
Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
committer Mark Brown <[email protected]>
Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
diff --cc drivers/spi/spi-pxa2xx-dma.c
Simple merge
diff --cc drivers/spi/spi-pxa2xx.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
committer	Mark Brown <[email protected]>
	Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
		1	2
drivers/spi/spi-pxa2xx-dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-pxa2xx.c	patch \|	diff1 \|	diff2 \|	blob \| history