Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2

Conflicts:
	arch/arm/plat-s5p/include/plat/pll.h

diff --cc arch/arm/mach-s3c2416/clock.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/clock.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/cpu.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/exynos4.h
index 0000000000000000000000000000000000000000,691a7113fff280917c7e471a16f47b32bfa073a7..20d73bf77537574066ad4e21564b67e0f979fbcb
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/plat-samsung/include/plat/exynos4.h
+++ b/arch/arm/plat-samsung/include/plat/exynos4.h
@@@ -1,0 -1,34 +1,35 @@@
 -#ifdef CONFIG_CPU_EXYNOS4210
 -
+ /* linux/arch/arm/plat-samsung/include/plat/exynos4.h
+  *
+  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+  *            http://www.samsung.com
+  *
+  * Header file for exynos4 cpu support
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+ */
+ 
+ /* Common init code for EXYNOS4 related SoCs */
+ 
+ extern void exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+ extern void exynos4_register_clocks(void);
++extern void exynos4210_register_clocks(void);
++extern void exynos4212_register_clocks(void);
+ extern void exynos4_setup_clocks(void);
+ 
++#ifdef CONFIG_ARCH_EXYNOS4
+ extern  int exynos4_init(void);
+ extern void exynos4_init_irq(void);
+ extern void exynos4_map_io(void);
+ extern void exynos4_init_clocks(int xtal);
+ extern struct sys_timer exynos4_timer;
+ 
+ #define exynos4_init_uarts exynos4_common_init_uarts
+ 
+ #else
+ #define exynos4_init_clocks NULL
+ #define exynos4_init_uarts NULL
+ #define exynos4_map_io NULL
+ #define exynos4_init NULL
+ #endif