Merge remote-tracking branch 'spi/topic/dma' into spi-next
authorMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
1  2 
drivers/spi/spi.c
include/linux/spi/spi.h

Simple merge
Simple merge