Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
commit940010c5a314a7bd9b498593bc6ba1718ac5aec5
treed141e08ced08c40c6a8e3ab2cdecde5ff14e560f
parent8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5
parent991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d
Merge branch 'linus' into perfcounters/core

Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
22 files changed:
arch/x86/Kconfig
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq_vectors.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/irq.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
arch/x86/oprofile/nmi_int.c
arch/x86/vdso/vma.c
include/linux/init_task.h
include/linux/sched.h
init/Kconfig
kernel/Makefile
kernel/exit.c
kernel/fork.c
kernel/mutex.c
kernel/sched.c
kernel/sysctl.c
kernel/timer.c