ARM: Merge next-samsung

Merge branch 'next-samsung' into for-linus/2634-git-updates