ARM: Merge s3c24xx-updates2

Merge branch 's3c24xx-updates2' into for-linus/samsung