lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
5 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/Documentation/Makefile
View File

@ -35,7 +35,7 @@ man7dir=$(mandir)/man7
# DESTDIR=
ASCIIDOC=asciidoc
ASCIIDOC_EXTRA =
ASCIIDOC_EXTRA = --unsafe
MANPAGE_XSL = manpage-normal.xsl
XMLTO_EXTRA =
INSTALL?=install

0
tools/perf/Documentation/perf-examples.txt → tools/perf/Documentation/examples.txt
View File