ARM: Merge next-samsung-s3c244x-merge

Merge branch 'next-samsung-s3c244x-merge' into next-samsung