From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 24 Feb 2009 23:59:14 +0000 (-0800)
Subject: Merge branch 'x86/defconfig' into x86/mce2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2aaa822984b97efd894d10d1e1382206ef0291a7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'x86/defconfig' into x86/mce2

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

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

2aaa822984b97efd894d10d1e1382206ef0291a7