ARM: Merge next-samsung-devupdates2

Merge branch 'next-samsung-devupdates2' into next-samsung