summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2021-02-12 13:39:32 +0100
committerIngo Molnar <mingo@kernel.org>2021-02-12 13:40:02 +0100
commit40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f (patch)
tree9343f6be910d5ccd6195a68ef9f4c251abc7418c /tools
parentc46f52231e79af025e2c89e889d69ec20a4c024f (diff)
parent3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2 (diff)
downloadlinux-40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f.tar.gz
Merge branch 'x86/cleanups' into x86/mm
Merge recent cleanups to the x86 MM code to resolve a conflict.

Conflicts:
	arch/x86/mm/fault.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions