From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 18 Aug 2011 19:58:46 +0000 (+0200)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=51887c8230d57c4d9cc68e3784c52c8f0a708655;p=deliverable%2Flinux.git

Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux into perf/core

Conflicts:
	tools/perf/builtin-stat.c
---

51887c8230d57c4d9cc68e3784c52c8f0a708655
diff --cc tools/perf/builtin-stat.c
index 5deb17d9e795,a22393d7ec6d..bec64a9e741c
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@@ -193,7 -193,8 +193,9 @@@ static int			big_num_opt			=  -1
  static const char		*cpu_list;
  static const char		*csv_sep			= NULL;
  static bool			csv_output			= false;
 +static bool			group				= false;
+ static const char		*output_name			= NULL;
+ static FILE			*output				= NULL;
  
  static volatile int done = 0;