Merge commit 'v2.6.29-rc4' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 08:22:04 +0000 (09:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 08:22:04 +0000 (09:22 +0100)
commit95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c
treeaa2aac22a5b329b778a6771a87bbf1945ad49bbd
parentd278c48435625cb6b7edcf6a547620768b175709
parent8e4921515c1a379539607eb443d51c30f4f7f338
Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
33 files changed:
arch/arm/kernel/irq.c
arch/blackfin/kernel/irqchip.c
arch/sparc/kernel/irq_64.c
arch/x86/ia32/ia32entry.S
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/io_apic.c
arch/x86/kernel/irqinit_32.c
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/signal.c
arch/x86/kernel/tlb_uv.c
arch/x86/mach-voyager/setup.c
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
arch/x86/mm/init_32.c
arch/x86/xen/multicalls.h
drivers/acpi/processor_idle.c
drivers/misc/Kconfig
drivers/net/sfc/efx.c
fs/exec.c
include/linux/init_task.h
include/linux/sched.h
include/linux/syscalls.h
init/Kconfig
kernel/fork.c
kernel/irq/chip.c
kernel/irq/handle.c
kernel/irq/manage.c
kernel/irq/numa_migrate.c
kernel/sched.c
kernel/sys.c