ARM: Merge for-2635-4/s5pc1xx-removal

Merge branch 'for-2635-4/s5pc1xx-removal' into for-2635-4/partial1