diff options
author | 2017-06-12 08:43:53 +0200 | |
---|---|---|
committer | 2017-06-12 08:43:53 +0200 | |
commit | 81606aea2303aa11867e97030299b1057091c2fd (patch) | |
tree | f9231fa1ebc03221afc54507602ee0ff057da2cb /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | usb: host: ohci-omap3: Remove driver in favor of ohci-platform (diff) | |
parent | Linux 4.12-rc5 (diff) | |
download | linux-dev-81606aea2303aa11867e97030299b1057091c2fd.tar.xz linux-dev-81606aea2303aa11867e97030299b1057091c2fd.zip |
Merge 4.12-rc5 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 9d92af7d0718..40de3cb40d21 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1219,7 +1219,7 @@ static int python_generate_script(struct pevent *pevent, const char *outfile) fprintf(ofp, "# be retrieved using Python functions of the form " "common_*(context).\n"); - fprintf(ofp, "# See the perf-trace-python Documentation for the list " + fprintf(ofp, "# See the perf-script-python Documentation for the list " "of available functions.\n\n"); fprintf(ofp, "import os\n"); |