ARM: S5PC100: Fixup cross tree merge problems