Merge branch 'x86/x2apic' into x86/core
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:21:21 +0000 (09:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:21:21 +0000 (09:21 +0200)
Conflicts:
arch/x86/kernel/cpu/common_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge