Merge commit 'v2.6.34-rc2' into perf/core

[safe/jmp/linux-2.6] / tools / perf / perf.c

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 0d4b9ed..d2de839 100644 (file)
--- 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.
         */