Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 31 Jan 2017 07:38:17 +0000 (08:38 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 31 Jan 2017 07:38:17 +0000 (08:38 +0100)
commitf26483eaedec39b09b1f2bdfc3f0d18f86764327
tree4d5b94adb85d84517462d4883c59cbf3af5dd116
parentda0aa3dde05108e180eecd76534c55f43ea4b9c8
parent24c2503255d35c269b67162c397a1a1c1e02f6ce
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>
arch/x86/include/asm/microcode.h
arch/x86/kernel/cpu/microcode/core.c