Merge branch 'smp-fix'

arch/arm/common/gic.c

arch/arm/include/asm/hardware/gic.h

arch/arm/include/asm/smp.h

arch/arm/kernel/smp.c

arch/arm/mach-realview/core.c

arch/arm/mach-realview/include/mach/smp.h

arch/arm/mach-realview/localtimer.c

arch/arm/mach-realview/platsmp.c

drivers/acpi/acpica/Makefile

drivers/acpi/acpica/aclocal.h

drivers/acpi/bus.c

drivers/acpi/processor_idle.c

drivers/acpi/processor_throttling.c

drivers/acpi/video.c

drivers/gpu/drm/Kconfig

drivers/ide/icside.c

drivers/ide/ide-tape.c

drivers/ide/piix.c

drivers/platform/x86/asus-laptop.c

drivers/platform/x86/eeepc-laptop.c