Merge branch 'x86/uv' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 21:01:04 +0000 (23:01 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 21:01:04 +0000 (23:01 +0200)
commit9553e11325e3d44a8c8a1428c7e5f146f1cc7238
tree98a95631f6b810436eca57c242ade769906200fa
parent453c1404c5273a30d715e5a83372a78cff70b6d9
parent7019cc2dd6fafcdc6b104005482dc910dcdbb797
Merge branch 'x86/uv' into x86/x2apic

Conflicts:

arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/Makefile
arch/x86/kernel/genx2apic_uv_x.c