Merge branch 'next/topic-s3c64xx-devel' into next-samsung-devel