From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 31 Jan 2017 07:38:17 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f26483eaedec;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts

 Conflicts:
  arch/x86/kernel/cpu/microcode/amd.c
  arch/x86/kernel/cpu/microcode/core.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

f26483eaedec39b09b1f2bdfc3f0d18f86764327