Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...

Conflicts:
	tools/perf/builtin-stat.c

diff --cc tools/perf/builtin-stat.c
index 5deb17d9e79506028921b512f734b4a6becc4f32,a22393d7ec6dfa03353d9365713bd07112397743..bec64a9e741c38d44378c1c90feeca3574929f05
--- 1/tools/perf/builtin-stat.c
--- 2/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;