diff options
author | 2016-05-06 11:40:24 -0700 | |
---|---|---|
committer | 2016-05-06 11:40:24 -0700 | |
commit | 18fb92c30c766a5fb4593ecd0d9155b33d139e8e (patch) | |
tree | e644bd8491eddfec47ced2d3543c92fb84dfaee5 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs (diff) | |
download | wireguard-linux-18fb92c30c766a5fb4593ecd0d9155b33d139e8e.tar.xz wireguard-linux-18fb92c30c766a5fb4593ecd0d9155b33d139e8e.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"This tree contains two fixes: new Intel CPU model numbers and an
AMD/iommu uncore PMU driver fix"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs
perf/x86: Add model numbers for Kabylake CPUs
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions