Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

fbdd17ec

Commit fbdd17ec authored 11 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'perf-core-for-mingo' into perf/urgent


Conflicts:
	tools/perf/bench/numa.c

Pull perf fixes from Jiri Olsa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 740c699a 90f6bb6c

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 1 addition, 1 deletion

MAINTAINERS
tools/lib/traceevent/event-parse.c 66 additions, 43 deletions

tools/lib/traceevent/event-parse.c
tools/perf/Documentation/perf-bench.txt 22 additions, 0 deletions

tools/perf/Documentation/perf-bench.txt
tools/perf/Documentation/perf-top.txt 0 additions, 1 deletion

tools/perf/Documentation/perf-top.txt
tools/perf/bench/numa.c 4 additions, 0 deletions

tools/perf/bench/numa.c
tools/perf/builtin-stat.c 9 additions, 2 deletions

tools/perf/builtin-stat.c
tools/perf/config/Makefile 4 additions, 3 deletions

tools/perf/config/Makefile
tools/perf/util/probe-finder.c 9 additions, 6 deletions

tools/perf/util/probe-finder.c

with 115 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment