Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
authorMark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 12:59:05 +0000 (13:59 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 12:59:05 +0000 (13:59 +0100)
commitb5f9a9d5113efe11a3b9dad600a6f833274da595
tree6db5fb34a2d590086e25f7f682fecb5f43e6b283
parenta1216394e620d0dfbb03c712ae3210e7b77c9e11
parent8d4d08ce8319ae26227c4dd558405963c14c2037
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Conflicts:
drivers/spi/spi-rspi.c
drivers/spi/spi-altera.c
drivers/spi/spi-nuc900.c
drivers/spi/spi-rspi.c
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-xilinx.c