Merge branch 'x86/uv' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:13 +0000 (12:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:13 +0000 (12:24 +0200)
commite3ae0acf59244ecf5b023ec99cef4b6b29d649bc
tree02a8bfdcab61677430ecfe04e9e44e1007c35f0e
parent4b62ac9a2b859f932afd5625362c927111b7dd9b
parente7eb8726d0e144f0925972c4ecee945e91a42753
Merge branch 'x86/uv' into x86/devel
arch/x86/kernel/Makefile
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/smpboot.c
include/asm-x86/atomic_64.h
include/asm-x86/mpspec.h