diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 03:18:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 03:18:32 -0500 |
| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (patch) | |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 /tools/perf/.gitignore | |
| parent | 83f0d53993b2967e54186468b0fc4321447f68f1 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/.gitignore')
| -rw-r--r-- | tools/perf/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index fe08660ce0bd..124760bb37b5 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore | |||
| @@ -13,6 +13,7 @@ perf*.xml | |||
| 13 | perf*.html | 13 | perf*.html |
| 14 | common-cmds.h | 14 | common-cmds.h |
| 15 | perf.data | 15 | perf.data |
| 16 | perf.data.old | ||
| 16 | tags | 17 | tags |
| 17 | TAGS | 18 | TAGS |
| 18 | cscope* | 19 | cscope* |