Merge branch 'u300/cleanup' into next/cleanup

* u300/cleanup:
  ARM: u300: delete memory.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-u300/u300.c
index 4a4fd334eb6e5fb081ae81f99422ec9c1f440a0b,b200312345c5df69f4b7117405718ca650036659..5f0f7060f3a1d4e658a7f7d883e40e92fe59546a
--- 1/arch/arm/mach-u300/u300.c
--- 2/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@@ -47,10 -46,9 +47,10 @@@ static void __init u300_init_machine(vo
  
  MACHINE_START(U300, MACH_U300_STRING)
        /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-       .atag_offset    = BOOT_PARAMS_OFFSET,
+       .atag_offset    = 0x100,
        .map_io         = u300_map_io,
        .init_irq       = u300_init_irq,
 +      .handle_irq     = vic_handle_irq,
        .timer          = &u300_timer,
        .init_machine   = u300_init_machine,
  MACHINE_END