ARM: SAMSUNG: Fixup merge problem