diff options
author | 2016-06-08 12:03:16 +0200 | |
---|---|---|
committer | 2016-06-08 12:03:16 +0200 | |
commit | 020d704c3e107eba4b416b9013179437a128b454 (patch) | |
tree | 2dce22a2e336f4b9fea9afbe2ef5b27d7ea296b3 /tools/perf/scripts/python/stackcollapse.py | |
parent | Merge tag 'perf-core-for-mingo-20160607' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
parent | x86/cpu/intel: Introduce macros for Intel family numbers (diff) | |
download | linux-dev-020d704c3e107eba4b416b9013179437a128b454.tar.xz linux-dev-020d704c3e107eba4b416b9013179437a128b454.zip |
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/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions