diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-09 23:18:16 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-09 23:18:16 +0000 |
| commit | acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 (patch) | |
| tree | 2da3a61b6726707a89f1cf93446aabd2fb00e1f0 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
| -rw-r--r-- | tools/perf/scripts/python/check-perf-trace.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py index d9f7893e315..4647a7694cf 100644 --- a/tools/perf/scripts/python/check-perf-trace.py +++ b/tools/perf/scripts/python/check-perf-trace.py @@ -1,4 +1,4 @@ -# perf trace event handlers, generated by perf trace -g python +# perf script event handlers, generated by perf script -g python # (c) 2010, Tom Zanussi <tzanussi@gmail.com> # Licensed under the terms of the GNU GPL License version 2 # |