Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / scripting-engines / trace-event-python.c

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index c83c2c6..4e4aa4c 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -1531,7 +1531,7 @@ static void set_table_handlers(struct tables *tables)
                 * Attempt to use the call path root from the call return
                 * processor, if the call return processor is in use. Otherwise,
                 * we allocate a new call path root. This prevents exporting
-                * duplicate call path ids when both are in use simultaniously.
+                * duplicate call path ids when both are in use simultaneously.
                 */
                if (tables->dbe.crp)
                        tables->dbe.cpr = tables->dbe.crp->cpr;