Merge branch 'x86/core' into x86/mce2

author H. Peter Anvin <hpa@zytor.com>

Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)

committer H. Peter Anvin <hpa@zytor.com>

Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
author H. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
committer H. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/alternative.c
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	patch \|	diff1 \|	diff2 \|	blob \| history