Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus