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

arch/x86/configs/i386_defconfig

+330 −87

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/configs/x86_64_defconfig

+335 −85

File changed.

Preview size limit exceeded, changes collapsed.