diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 11:09:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 11:09:27 +0300 |
| commit | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch) | |
| tree | dce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /tools/perf/util/block-info.c | |
| parent | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (diff) | |
| parent | 004e8dce9c5595697951f7cd0e9f66b35c92265e (diff) | |
| download | linux-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.tar.xz | |
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 'tools/perf/util/block-info.c')
0 files changed, 0 insertions, 0 deletions