aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2014-04-18 10:14:55 +0000
committerIngo Molnar <[email protected]>2014-04-18 10:14:55 +0000
commit1111b680d34bc19190f02a1b4479c3fcc592c22e (patch)
tree9d45ad88b9354205a2d1fd76a338ab8693a16d86 /tools/perf/builtin-annotate.c
parentMerge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentperf/x86/intel: Use rdmsrl_safe() when initializing RAPL PMU (diff)
downloadkernel-1111b680d34bc19190f02a1b4479c3fcc592c22e.tar.gz
kernel-1111b680d34bc19190f02a1b4479c3fcc592c22e.zip
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions