Merge branch 'x86/defconfig' into x86/mce2
Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
commit
2aaa822984
Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin <hpa@zytor.com>