Merge branch 'for-3.3/soc' into for-next

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/include/mach/entry-macro.S

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/kernel/setup.c
index 8fc2c8fcbdc646a4a8babecbf4a758f88e6d8d60,5c7094e8f6e9e5f765e0ef2ac79c3711fc7fc923..095d6611c84e60443ae429e2c5e36b4074a02df7
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -902,14 -911,8 +909,14 @@@ void __init setup_arch(char **cmdline_p
        machine_desc = mdesc;
        machine_name = mdesc->name;
  
-       if (mdesc->soft_reboot)
-               reboot_setup("s");
 +#ifdef CONFIG_ZONE_DMA
 +      if (mdesc->dma_zone_size) {
 +              extern unsigned long arm_dma_zone_size;
 +              arm_dma_zone_size = mdesc->dma_zone_size;
 +      }
 +#endif
+       if (mdesc->restart_mode)
+               reboot_setup(&mdesc->restart_mode);
  
        init_mm.start_code = (unsigned long) _text;
        init_mm.end_code   = (unsigned long) _etext;

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge

diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index 485a11eeaceb6f469d5078e9775e2070a98d109a,ac11262149c701b0908b6f54b31c90ba206fbb82..e577cfe27e72c0d328e965d9bef23c610ccda671
--- 1/arch/arm/mach-tegra/include/mach/entry-macro.S
--- 2/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@@ -24,10 -16,23 +16,5 @@@
        .macro  disable_fiq
        .endm
  
-       .macro  get_irqnr_preamble, base, tmp
-       movw \base, #(ICTRL_BASE & 0x0000ffff)
-       movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
-       .endm
- 
-       .macro  arch_ret_to_user, tmp1, tmp2
+       .macro  arch_ret_to_user, tmp1, tmp2
        .endm
 -
 -#if !defined(CONFIG_ARM_GIC)
 -      /* legacy interrupt controller for AP16 */
 -
 -      .macro  get_irqnr_preamble, base, tmp
 -      @ enable imprecise aborts
 -      cpsie   a
 -      @ EVP base at 0xf010f000
 -      mov \base, #0xf0000000
 -      orr \base, #0x00100000
 -      orr \base, #0x0000f000
 -      .endm
 -
 -      .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
 -      ldr \irqnr, [\base, #0x20]      @ EVT_IRQ_STS
 -      cmp \irqnr, #0x80
 -      .endm
 -#endif

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

diff --cc mm/vmalloc.c
Simple merge