Merge branch 'next-s3c64xx-fixes' into next-s3c-fixes