Merge branch 'x86/mce2' into x86/core
commitcaab36b593b44c97e3c7707c6a8054b320f8d622
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 20:49:25 +0000 (5 21:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 20:49:25 +0000 (5 21:49 +0100)
tree70c8d67d51c616c357529d761a82ad382481dad7
parenta1413c89ae6a4b7a9a43f7768934a81ffb5c629a
parent73af76dfd1f998dba71d8e8e785cbe77a990bf17
Merge branch 'x86/mce2' into x86/core
arch/x86/Kconfig