OSDN Git Service

Merge branches 'x86/urgent' and 'core/urgent' into x86/boot, to pick up fixes and...
authorIngo Molnar <mingo@kernel.org>
Sat, 19 May 2018 06:18:56 +0000 (08:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 19 May 2018 06:18:56 +0000 (08:18 +0200)
commit177bfd725bd1b67c7254248cf19f0465d493e631
tree7073a8014605640de923b52a040f86915c16612d
parent9305bd6ca7b40fece04d7a7a02765e9e8349f146
parentfed71f7d98795ed0fa1d431910787f0f4a68324f
parent7dec80ccbe310fb7e225bf21c48c672bb780ce7b
Merge branches 'x86/urgent' and 'core/urgent' into x86/boot, to pick up fixes and avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/smpboot.c