Merge commit 'v2.6.34-rc2' into perf/core

Merge reason: Pick up latest perf fixes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 1a4e8376d843..c37da8b88573 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -321,7 +321,7 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct callchain_node *self,
                         new_depth_mask &= ~(1 << (depth - 1));
 
                 /*
-                 * But we keep the older depth mask for the line seperator
+                 * But we keep the older depth mask for the line separator
                  * to keep the level link until we reach the last child
                  */
                 ret += ipchain__fprintf_graph_line(fp, depth, depth_mask,