Merge branch 'topic/s3c64xx' into for-linus