]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed...
authorIngo Molnar <mingo@kernel.org>
Mon, 25 Nov 2019 08:09:27 +0000 (09:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 25 Nov 2019 08:09:27 +0000 (09:09 +0100)
commitd4235e0f95023c0bf59801c2b2eb3247fb74e5c7
treedce8c1a21347cd12b44ed56af4aafc2a58c9ec08
parent30528746caecf2d5d6ce6ba976a500aae47bbbdc
parent817efeeed44db6afb915a4f4a9ec73d4eed2db6a
Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree

Conflicts:
tools/perf/check-headers.sh

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kvm/x86.c
tools/perf/check-headers.sh