Merge branch 'x86/core' into x86/mce2
authorH. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
1  2 
arch/x86/Kconfig
arch/x86/kernel/alternative.c

Simple merge
Simple merge