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)
commit7e016d146f90530545798ad46ec0662c1c69c505
treeeb91cc54f8c9803095c8bc156c1d56b14816b37d
parent37553b9236d36cc9ca18f1e5633fda4ed48bc50d
parent4b30f2a1218220c295b01af6f219ab0477064a74
Merge remote-tracking branch 'spi/topic/pxa' into spi-next
drivers/spi/spi-pxa2xx-dma.c
drivers/spi/spi-pxa2xx.c