Merge commit 'spi/fix/rcar' into spi-linus
authorMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:13:30 +0000 (13:13 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:13:30 +0000 (13:13 +0000)
1  2 
drivers/spi/spi-rspi.c

Simple merge