Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

2010-12-02 11:20:11 +01:00
parent b3d006c0e7 d7470b6afc
commit e4b546a364
15 changed files with 324 additions and 68 deletions
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -104,6 +104,13 @@ OPTIONS
        normally don't - this option allows the latter to be run in
        system-wide mode.

+-i::
+--input=::
+        Input file name.
+
+-d::
+--debug-mode::
+        Do various checks like samples ordering and lost events.

 SEE ALSO
 --------