Merge branches 'next/soc' and 'next/board' into for-next

diff --cc arch/arm/mach-exynos4/clock.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-tegra/board-harmony.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-seaboard.c
Simple merge

diff --cc arch/arm/mach-tegra/board-trimslice.c
Simple merge

diff --cc arch/arm/plat-s5p/include/plat/pll.h
Simple merge