Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable

diff --cc arch/arm/mach-u300/include/mach/memory.h
index 38741da0d2619ff40f720f08686a1d6c22c88419,f98acd91abd39fd5139c319dd87a40b4a7021357..7034bae95de616945bdcbc4f53e4b6aeafb160f9
--- 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
@@@ -28,10 -30,13 +30,8 @@@
  #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
- #define BOOT_PARAMS_OFFSET (0x28000000 + \
-           (CONFIG_MACH_U300_ACCESS_MEM_SIZE +         \
-           (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
  #endif
  
 -/*
 - * We enable a real big DMA buffer if need be.
 - */
 -#define CONSISTENT_DMA_SIZE SZ_4M
 -
  #endif