diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 11:03:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 11:03:10 +0100 |
commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /tools/perf/util/util.c | |
parent | perf/cgroup: Add __percpu annotation to perf_cgroup->info (diff) | |
parent | perf/x86: Add SNB/SNB-EP scheduling constraints for cycle_activity event (diff) | |
download | linux-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.tar.xz linux-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.zip |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/util.c')
0 files changed, 0 insertions, 0 deletions