diff options
| author | Ingo Molnar <[email protected]> | 2019-09-02 07:10:07 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2019-09-02 07:10:07 +0000 |
| commit | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (patch) | |
| tree | e057ab71829a12ded68d9d22e661f0e391b5ad6b /tools/perf/scripts/python/intel-pt-events.py | |
| parent | x86/intel: Add common OPTDIFFs (diff) | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | kernel-77e5517cb506c5b1e0a91bf4774cc95452659d77.tar.gz kernel-77e5517cb506c5b1e0a91bf4774cc95452659d77.zip | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/power/x86/turbostat/turbostat.c
Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu,
sort it out.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/intel-pt-events.py')
0 files changed, 0 insertions, 0 deletions