ARM: Merge for-2635/samsung-ts

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