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