ARM: Merge next-s3c64xx