ARM: Merge for-2635/s5p-general

Merge branch 'for-2635/s5p-general' into for-linus/samsung2