Merge branch 'perfcounters/urgent' into perfcounters/core

Browse source

Conflicts:
	tools/perf/builtin-annotate.c
	tools/perf/builtin-report.c

Merge reason: resolve these conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-08-19 14:50:35 +02:00

parent 6e086437f3 4464fcaa9c

commit 96d6e48bc6

6 changed files with 263 additions and 227 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

kernel/perf_counter.c

View file

2

tools/perf/Documentation/Makefile

View file

0

tools/perf/Documentation/perf-examples.txt → tools/perf/Documentation/examples.txt

View file

14

tools/perf/builtin-annotate.c

View file

7

tools/perf/builtin-report.c

View file