Merge branch 'fixes' into for-next

Conflicts:
	arch/arm/kernel/setup.c

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 5c7094e8f6e9e5f765e0ef2ac79c3711fc7fc923,8fc2c8fcbdc646a4a8babecbf4a758f88e6d8d60..095d6611c84e60443ae429e2c5e36b4074a02df7
--- 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-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/Makefile
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge