diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-19 14:50:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-24 09:24:01 +0200 |
| commit | 96d6e48bc6b38342a59ccd23e25907d12caaeaf8 (patch) | |
| tree | b770d9e94545e198e120fac31f650600a855f689 /tools/perf/Documentation | |
| parent | 6e086437f35ad9fda448711732c4ce0f82aad569 (diff) | |
| parent | 4464fcaa9cbfc9c551956b48af203e2f775ca892 (diff) | |
| download | talos-op-linux-96d6e48bc6b38342a59ccd23e25907d12caaeaf8.tar.gz talos-op-linux-96d6e48bc6b38342a59ccd23e25907d12caaeaf8.zip | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
tools/perf/builtin-annotate.c
tools/perf/builtin-report.c
Merge reason: resolve these conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/Documentation')
| -rw-r--r-- | tools/perf/Documentation/Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/Documentation/examples.txt (renamed from tools/perf/Documentation/perf-examples.txt) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 5457192e1b41..bdd3b7ecad0a 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile @@ -35,7 +35,7 @@ man7dir=$(mandir)/man7 # DESTDIR= ASCIIDOC=asciidoc -ASCIIDOC_EXTRA = +ASCIIDOC_EXTRA = --unsafe MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = INSTALL?=install diff --git a/tools/perf/Documentation/perf-examples.txt b/tools/perf/Documentation/examples.txt index 8eb6c489fb15..8eb6c489fb15 100644 --- a/tools/perf/Documentation/perf-examples.txt +++ b/tools/perf/Documentation/examples.txt |
