Merge branch 's3c64xx-drivers' into s3c64xx