diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-01-29 03:24:57 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-01-29 04:36:22 -0500 |
commit | ae7f6711d6231c9ba54feb5ba9856c3775e482f8 (patch) | |
tree | 89070c82204b2503348e4fd6c51d25a169375545 /tools/perf/.gitignore | |
parent | 64abebf731df87e6f4ae7d9ffc340bdf0c033e44 (diff) | |
parent | b23ff0e9330e4b11e18af984d50573598e10e7f9 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch. Also update to
later -rc's.
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* |