Merge commit 'v2.6.29-rc4' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 13:58:11 +0000 (14:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 13:58:11 +0000 (14:58 +0100)
commit249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e
tree7fc06930e46ee13d394f5b031166c40206af3189
parent44581a28e805a31661469c4b466b9cd14b36e7b6
parent8e4921515c1a379539607eb443d51c30f4f7f338
Merge commit 'v2.6.29-rc4' into core/percpu

Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
21 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/mach-voyager/setup.c
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
arch/x86/xen/multicalls.h
drivers/misc/Kconfig
drivers/net/sfc/efx.c
include/linux/sched.h
kernel/fork.c
kernel/irq/chip.c
kernel/irq/numa_migrate.c
kernel/sched.c