]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd4348c179a657ece5920f4b4faca87ff7351380c
tree4d5b94adb85d84517462d4883c59cbf3af5dd116
parent3b30c5b0402ec9792eaa0ec6ff658c3f9295687f
parent9654a633447d1992b6f8c5fd9db0a5c65dfc7663
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