]> git.ipfire.org Git - thirdparty/kernel/stable.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)
commitceb9e77324fa661b1001a0ae66f061b5fcb4e4e6
treedce8c1a21347cd12b44ed56af4aafc2a58c9ec08
parentc494cd6469ab0f4bdd663d1a2d396b0ec2f42103
parent004e8dce9c5595697951f7cd0e9f66b35c92265e
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