---

yaml --- r: 273917 b: refs/heads/master c: dc822e5 h: refs/heads/master i: 273915: 94e4543 v: v3
git-mirror · Nov 5, 2011 · b864dc3 · b864dc3
1 parent 57cb8c6
commit b864dc3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a
+refs/heads/master: dc822e57ee05856291a8c9324d2309076ee5f5e2
diff --git a/trunk/arch/arm/mach-exynos4/clock.c b/trunk/arch/arm/mach-exynos4/clock.c
@@ -1286,11 +1286,8 @@ void __init exynos4_register_clocks(void)
 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 
-<<<<<<< HEAD
 	register_syscore_ops(&exynos4_clock_syscore_ops);
-=======
 	s3c24xx_register_clock(&dummy_apb_pclk);
 
->>>>>>> 4598fc2c94b68740e0269db03c98a1e7ad5af773
 	s3c_pwmclk_init();
 }