Merge branch 'spi-fix-s3c64xx' into spi-next