Merge branch 'next-s3c64xx' into for-next