Merge remote-tracking branch 'spi/topic/pxa' into spi-next
authorMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:21:03 +0000 (16:21 +0100)
1  2 
drivers/spi/spi-pxa2xx-dma.c
drivers/spi/spi-pxa2xx.c

Simple merge
Simple merge