ARM: Merge next-samsung-clock2

Merge branch 'next-samsung-clock2' into next-samsung-try5