Merge branch 'rmk/devel-stable' into for-next

Conflicts:
	arch/arm/mach-u300/include/mach/memory.h

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

diff --cc arch/arm/mach-imx/mach-armadillo5x0.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx35.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx1ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx25_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge

diff --cc arch/arm/mach-mx5/board-cpuimx51.c
Simple merge

diff --cc arch/arm/mach-mx5/board-cpuimx51sd.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_3ds.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge

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

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/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-u300/include/mach/memory.h
index 02bd832f063e5bc231eadc760751b819840411f2,7034bae95de616945bdcbc4f53e4b6aeafb160f9..c808f347a081e03990c1b79835d7056d385ec2ad
--- 1/arch/arm/mach-u300/include/mach/memory.h
--- 2/arch/arm/mach-u300/include/mach/memory.h
+++ b/arch/arm/mach-u300/include/mach/memory.h
@@@ -13,12 -13,25 +13,7 @@@
  #ifndef __MACH_MEMORY_H
  #define __MACH_MEMORY_H
  
 -#ifdef CONFIG_MACH_U300_DUAL_RAM
 -
 -#define PLAT_PHYS_OFFSET              UL(0x48000000)
 -#define BOOT_PARAMS_OFFSET            0x100
 -
 -#else
 -
 -#ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
 -#define PLAT_PHYS_OFFSET (0x28000000 + \
 -           (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \
 -           (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
 -#define BOOT_PARAMS_OFFSET (0x100 + \
 -           (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1)*1024*1024*2)
 -#else
 -#define PLAT_PHYS_OFFSET (0x28000000 + \
 -           (CONFIG_MACH_U300_ACCESS_MEM_SIZE +        \
 -           (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
 -#define BOOT_PARAMS_OFFSET 0x100
 -#endif
 -#endif
 +#define PLAT_PHYS_OFFSET      UL(0x48000000)
- #define BOOT_PARAMS_OFFSET    (PLAT_PHYS_OFFSET + 0x100)
- 
- /*
-  * We enable a real big DMA buffer if need be.
-  */
- #define CONSISTENT_DMA_SIZE SZ_4M
++#define BOOT_PARAMS_OFFSET    0x100
  
  #endif

diff --cc arch/arm/mach-u300/u300.c
index 25d11bac2a103c8167b788dc4cbb5d594a9e856e,80e7305589c63adcaa0312e624c67fd3ca04a5f6..89422ee7f3a8719d7edc0df21ccdbbd2710ea387
--- 1/arch/arm/mach-u300/u300.c
--- 2/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@@ -46,8 -61,9 +46,8 @@@ static void __init u300_init_machine(vo
  
  MACHINE_START(U300, MACH_U300_STRING)
        /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-       .boot_params    = BOOT_PARAMS_OFFSET,
+       .atag_offset    = BOOT_PARAMS_OFFSET,
        .map_io         = u300_map_io,
 -      .reserve        = u300_reserve,
        .init_irq       = u300_init_irq,
        .timer          = &u300_timer,
        .init_machine   = u300_init_machine,

diff --cc arch/arm/plat-mxc/include/mach/memory.h
Simple merge