summaryrefslogtreecommitdiff
path: root/tools/perf/perf.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-22 18:46:57 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-22 18:47:01 +0100
commitd2f1e15b661e71fd52111f51c99a6ce41384e9ef (patch)
tree8731e7e772e6f825ebbc6eef7681bc46302149bd /tools/perf/perf.c
parent40b7e05e17eef31ff30fe08dfc2424ef653a792c (diff)
parent220bf991b0366cc50a94feede3d7341fa5710ee4 (diff)
downloadlinux-3.10-d2f1e15b661e71fd52111f51c99a6ce41384e9ef.tar.gz
linux-3.10-d2f1e15b661e71fd52111f51c99a6ce41384e9ef.tar.bz2
linux-3.10-d2f1e15b661e71fd52111f51c99a6ce41384e9ef.zip
Merge commit 'v2.6.34-rc2' into perf/core
Merge reason: Pick up latest perf fixes from upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/perf.c')
-rw-r--r--tools/perf/perf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 0d4b9edfab1..d2de8393a33 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -449,7 +449,7 @@ int main(int argc, const char **argv)
/*
* We use PATH to find perf commands, but we prepend some higher
- * precidence paths: the "--exec-path" option, the PERF_EXEC_PATH
+ * precedence paths: the "--exec-path" option, the PERF_EXEC_PATH
* environment, and the $(perfexecdir) from the Makefile at build
* time.
*/