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)
Conflicts:
drivers/spi/spi-rspi.c


Trivial merge