Merge branch 'x86/apic' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 16:20:11 +0000 (17:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 16:20:11 +0000 (17:20 +0100)
commit0b6de0092244c98b5ba1abda34c92470a20e0d0c
tree478e4e18c33fd9fa517559e1ce951fe378d5965f
parent37a25424252b6cff4dd4b1937ab6a1dbfcadabcc
parentf62bae5009c1ba596cd475cafbc83e0570a36e26
Merge branch 'x86/apic' into perfcounters/core

Conflicts:
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/Kconfig
arch/x86/kernel/apic/apic.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/traps.c