ARM: EXYNOS4: Fix the merge conflict