Merge branch 'x86/defconfig' into x86/mce2

Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/defconfig' into x86/mce2
Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2aaa8229 · H. Peter Anvin · be71b855 · 15d4fcd6 · 2aaa8229 · 2aaa8229
Commit 2aaa8229 authored Feb 24, 2009 by H. Peter Anvin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 665 additions and 172 deletions

arch/x86/configs/i386_defconfig arch/x86/configs/i386_defconfig +330 -87

arch/x86/configs/x86_64_defconfig arch/x86/configs/x86_64_defconfig +335 -85

No files found.
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig