diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
| commit | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch) | |
| tree | fa7f8400ac685fb52e96f64997c7c682fc2aa021 /tools/perf/Documentation/perf-annotate.txt | |
| parent | 7b39f90fabcf9e2af0cd79d0a60440d821e22b56 (diff) | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'tools/perf/Documentation/perf-annotate.txt')
| -rw-r--r-- | tools/perf/Documentation/perf-annotate.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt index c9dcade06831..5164a655c39f 100644 --- a/tools/perf/Documentation/perf-annotate.txt +++ b/tools/perf/Documentation/perf-annotate.txt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | perf-annotate(1) | 1 | perf-annotate(1) |
| 2 | ============== | 2 | ================ |
| 3 | 3 | ||
| 4 | NAME | 4 | NAME |
| 5 | ---- | 5 | ---- |