Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635