summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-11-25 09:09:27 +0100
committerIngo Molnar <mingo@kernel.org>2019-11-25 09:09:27 +0100
commitceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch)
treedce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /kernel
parentc494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (diff)
parent004e8dce9c5595697951f7cd0e9f66b35c92265e (diff)
downloadlinux-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.tar.bz2
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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions