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)
Conflicts:
arch/x86/kernel/cpu/perfctr-watchdog.c


Trivial merge