Merge branch 'x86/core' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:49:38 +0000 (09:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:49:38 +0000 (09:49 +0100)
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c


Trivial merge