diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:25:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:25:07 +0200 |
| commit | f6f4bbc997ed23540d23ff3f073dd1ac091c6984 (patch) | |
| tree | 9148c4c99607822abc0a58c80d658a6e85990c8b /tools/perf/scripts/python | |
| parent | Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | x86, thermal: Clean up and fix CPU model detection for intel_soc_dts_thermal (diff) | |
| download | linux-f6f4bbc997ed23540d23ff3f073dd1ac091c6984.tar.gz linux-f6f4bbc997ed23540d23ff3f073dd1ac091c6984.zip | |
Merge branch 'x86/cpu' into x86/platform, to avoid conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions