ARM: Merge for-2635/rx1950

Merge branch 'for-2635/rx1950' into for-linus/samsung2