Merge branch 'v3.2-rc7' into next/pm

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c

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

diff --cc arch/arm/kernel/setup.c
index 5c7094e,8fc2c8f..095d661
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -911,8 -902,14 +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-shmobile/board-ag5evm.c
index 202c3c6,7119b87..f71fa3c
--- 1/arch/arm/mach-shmobile/board-ag5evm.c
--- 2/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@@ -607,8 -607,9 +607,9 @@@ struct sys_timer ag5evm_timer = 
  
  MACHINE_START(AG5EVM, "ag5evm")
        .map_io         = ag5evm_map_io,
+       .nr_irqs        = NR_IRQS_LEGACY,
        .init_irq       = sh73a0_init_irq,
 -      .handle_irq     = shmobile_handle_irq_gic,
 +      .handle_irq     = gic_handle_irq,
        .init_machine   = ag5evm_init,
        .timer          = &ag5evm_timer,
  MACHINE_END

diff --cc arch/arm/mach-shmobile/board-kota2.c
index 1b4439d,f44150b..857ceee
--- 1/arch/arm/mach-shmobile/board-kota2.c
--- 2/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@@ -447,8 -549,9 +549,9 @@@ struct sys_timer kota2_timer = 
  
  MACHINE_START(KOTA2, "kota2")
        .map_io         = kota2_map_io,
-       .init_irq       = kota2_init_irq,
+       .nr_irqs        = NR_IRQS_LEGACY,
+       .init_irq       = sh73a0_init_irq,
 -      .handle_irq     = shmobile_handle_irq_gic,
 +      .handle_irq     = gic_handle_irq,
        .init_machine   = kota2_init,
        .timer          = &kota2_timer,
  MACHINE_END

diff --cc mm/vmalloc.c
Simple merge