Merge branch 'x86/alternatives' into x86/core

author Ingo Molnar <mingo@elte.hu>

Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)

committer Ingo Molnar <mingo@elte.hu>

Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
author Ingo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
committer Ingo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
diff --cc arch/x86/kernel/alternative.c
Simple merge
diff --cc include/asm-x86/futex.h
Simple merge
diff --cc include/asm-x86/spinlock.h
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
		1	2
arch/x86/kernel/alternative.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-x86/futex.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	patch \|	diff1 \|	diff2 \|	blob \| history