Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

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

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 881add0,f851fe9..b1ec2cf
--- 1/arch/arm/mach-imx/mach-cpuimx27.c
--- 2/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
        .init = eukrea_cpuimx27_timer_init,
  };
  
- MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
+ MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
 -      .boot_params = MX27_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = mx27_map_io,
        .init_early = imx27_init_early,
        .init_irq = mx27_init_irq,

diff --cc arch/arm/mach-imx/mach-cpuimx35.c
index 10b8913,4bd083b..470b654
--- 1/arch/arm/mach-imx/mach-cpuimx35.c
--- 2/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
        .init   = eukrea_cpuimx35_timer_init,
  };
  
- MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
+ MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
        /* Maintainer: Eukrea Electromatique */
 -      .boot_params = MX3x_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,

diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index d8699b5,2442d5d..9163318
--- 1/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
--- 2/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
        .init   = eukrea_cpuimx25_timer_init,
  };
  
- MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
+ MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
        /* Maintainer: Eukrea Electromatique */
 -      .boot_params = MX25_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = mx25_map_io,
        .init_early = imx25_init_early,
        .init_irq = mx25_init_irq,

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-vexpress/v2m.c
Simple merge