Merge branch 'x86/paravirt-spinlocks' into x86/for-linus

author Ingo Molnar <mingo@elte.hu>

Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/paravirt.c
Simple merge
diff --cc include/asm-x86/paravirt.h
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 21 Jul 2008 14:45:56 +0000 (16:45 +0200)
		1	2
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/paravirt.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-x86/paravirt.h	patch \|	diff1 \|	diff2 \|	blob \| history