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)
commit0cab71e7014dc73a84e1d14d9b02e39c48241580
tree17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa
parent7d5f880b46f222ff83a76fd36b01f5a59bf32122
parent3e2bd64d243ff0f3dc08c49ff218fed42ee9d981
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx

Conflicts:
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-s3c64xx.c