Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur...

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
  ARM: PXA: fix gpio-pxa.h build errors
  ARM: 7142/1: davinci: mark GPIO implementation complex
  ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
  ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
  ARM: PXA: fix lubbock PCMCIA driver build error

diff --combined arch/arm/mach-exynos/platsmp.c
index 0559540,69ffb2f..69ffb2f
--- 1/arch/arm/mach-exynos/platsmp.c
--- 2/arch/arm/mach-exynos4/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -110,8 -110,6 +110,6 @@@ void __cpuinit platform_secondary_init(
         */
        spin_lock(&boot_lock);
        spin_unlock(&boot_lock);
- 
-       set_cpu_online(cpu, true);
  }
  
  int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)