Merge S3C24xx branch