summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-05-19 08:18:56 +0200
committerIngo Molnar <mingo@kernel.org>2018-05-19 08:18:56 +0200
commit177bfd725bd1b67c7254248cf19f0465d493e631 (patch)
tree7073a8014605640de923b52a040f86915c16612d /arch/x86/kernel/smpboot.c
parent9305bd6ca7b40fece04d7a7a02765e9e8349f146 (diff)
parentfed71f7d98795ed0fa1d431910787f0f4a68324f (diff)
parent7dec80ccbe310fb7e225bf21c48c672bb780ce7b (diff)
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>