Merge branch 'x86/uv' into x86/devel

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/apic_32.c
Simple merge

diff --cc arch/x86/kernel/apic_64.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc include/asm-x86/atomic_64.h
Simple merge

diff --cc include/asm-x86/mpspec.h
Simple merge