Merge branch 'next-s3c64xx-device' into next-merged