summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-01-28 19:08:52 +0100
committerIngo Molnar <mingo@kernel.org>2020-01-28 19:08:52 +0100
commit6bd3357b6181bd38c1a757168a8842e09ec6f3fb (patch)
tree4ee9215f2c35d7e3fd3e5747a992f531e41ca208 /arch/x86/kernel/nmi.c
parent32ada3b9e04c6f6d4916967bd8bbe2450ad5bc5e (diff)
parent538f127cd3bcf76071139f4bfe9cc3b2a46f3b3d (diff)
parent8757dc970f550dc399f899be0e7a2c00b7e82e8f (diff)
parent8b7e20a7ba54836076ff35a28349dabea4cec48f (diff)
downloadlinux-6bd3357b6181bd38c1a757168a8842e09ec6f3fb.tar.bz2
Merge branches 'x86/hyperv', 'x86/kdump' and 'x86/misc' into x86/urgent, to pick up single-commit branches
Signed-off-by: Ingo Molnar <mingo@kernel.org>