diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-06-08 12:03:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 12:03:16 +0200 |
commit | 020d704c3e107eba4b416b9013179437a128b454 (patch) | |
tree | 2dce22a2e336f4b9fea9afbe2ef5b27d7ea296b3 /tools/perf/scripts/python | |
parent | b8ab92201a64886fd3d8078fe46e51f658379823 (diff) | |
parent | 970442c599b22ccd644ebfe94d1d303bf6f87c05 (diff) |
Merge branch 'x86/urgent' into perf/core, to pick up dependency
We are going to clean up perf's use of magic Intel model numbers,
so merge in the prerequisite commit that adds the model number
defines.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions