Conflicts:
  arch/x86/kernel/cpu/microcode/amd.c
  arch/x86/kernel/cpu/microcode/core.c
Signed-off-by: NIngo Molnar <mingo@kernel.org>