ARM: Merge for-2635/samsung-clock

Merge branch 'for-2635/samsung-clock' into for-linus/samsung2