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)
commit2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd
tree8b8e5583fb2787ff7107a6f59b114ddcd2c2f691
parent638bee71c83a2837b48062fdc5b222163cf53d79
parent645af4e9e0e32481e3336dda813688732c7e5f0f
Merge branch 'x86/core' into x86/mce2
arch/x86/Kconfig
arch/x86/kernel/alternative.c