Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
authorMark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000 (14:27 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000 (14:27 +0100)
Conflicts:
drivers/spi/spi-s3c64xx.c


Trivial merge