ARM: Merge for-2635/s3c24xx-general

Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2