Skip to content
Commit 2aaa8229 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/defconfig' into x86/mce2 



Conflicts (resolved):
	arch/x86/configs/x86_64_defconfig

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents be71b855 15d4fcd6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment