Merge remote-tracking branch 's5p/for-next'

Conflicts:
	arch/arm/mach-exynos4/mach-smdkc210.c

diff --cc arch/arm/mach-exynos4/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos4/mach-smdkv310.c
index d90fcddbee1f8240a6acf8e9a1389ac5036e041b,57cf63219e606835a7e9f4ccf4d8c5123d0eba2c..e479171a18c1d59cf1760bb466e1548f88a024e1
--- 1/arch/arm/mach-exynos4/mach-smdkv310.c
--- 2/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@@ -260,4 -339,14 +339,14 @@@ MACHINE_START(SMDKV310, "SMDKV310"
        .map_io         = smdkv310_map_io,
        .init_machine   = smdkv310_machine_init,
        .timer          = &exynos4_timer,
 -      .boot_params    = S5P_PA_SDRAM + 0x100,
+       .reserve        = &smdkv310_reserve,
+ MACHINE_END
+ 
+ MACHINE_START(SMDKC210, "SMDKC210")
+       /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
++      .atag_offset    = 0x100,
+       .init_irq       = exynos4_init_irq,
+       .map_io         = smdkv310_map_io,
+       .init_machine   = smdkv310_machine_init,
+       .timer          = &exynos4_timer,
  MACHINE_END

diff --cc arch/arm/mach-exynos4/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/cpu.c
index 8dc05763a7ebe97d5d085d8624fa8f09bd1c8991,6c498f9a18c55014be61568af6e3222621442dce..c7047838e1122adaa9916b21cb870c2c11068ae7
--- 1/arch/arm/mach-s3c64xx/cpu.c
--- 2/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@@ -144,20 -143,11 +144,12 @@@ void __init s3c64xx_init_io(struct map_
        /* initialise the io descriptors we need for initialisation */
        iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
        iotable_init(mach_desc, size);
 +      init_consistent_dma_size(SZ_8M);
  
-       idcode = __raw_readl(S3C_VA_SYS + 0x118);
-       if (!idcode) {
-               /* S3C6400 has the ID register in a different place,
-                * and needs a write before it can be read. */
- 
-               __raw_writel(0x0, S3C_VA_SYS + 0xA1C);
-               idcode = __raw_readl(S3C_VA_SYS + 0xA1C);
-       }
+       /* detect cpu id */
+       s3c64xx_init_cpu();
  
-       s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids));
+       s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
  }
  
  static __init int s3c64xx_sysdev_init(void)

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

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

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

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

diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6450.c
Simple merge

diff --cc arch/arm/mach-s5pc100/mach-smdkc100.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge