Patches contributed by Eötvös Lorand University

commit ed3982cf3748b657ffb79d9d1c2e4a562661db2d
Merge: cba9bd22a5f8 d93dc5c4478c
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Sep 26 12:53:42 2011 +0200

    Merge commit 'v3.1-rc7' into perf/core
    
    Merge reason: Pick up the latest upstream fixes.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c
Merge: 88ebc08ea9f7 003f6c9df549
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Sep 18 14:01:26 2011 +0200

    Merge branch 'linus' into sched/core
    
    Merge reason: We are queueing up a dependent patch.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 76bf6877fed4f59826a72e0ab209badfc594008a
Merge: 0fa914c63221 b6fd41e29dea
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Sep 13 11:08:56 2011 +0200

    Merge commit 'v3.1-rc6' into core/locking
    
    Merge reason: We are queueing up locking annotation patches, move to a fresh base
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 51887c8230d57c4d9cc68e3784c52c8f0a708655
Merge: 8bc84f87315e 4aa9015f8bfd
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Aug 18 21:58:46 2011 +0200

    Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
    
    Conflicts:
            tools/perf/builtin-stat.c

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;
  
commit 8bc84f87315e8bdbe242ba788fdc6a74d653b177
Merge: 18e5a45db30e fe4c51b22080
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Aug 18 21:56:42 2011 +0200

    Merge branch 'perf/urgent' into perf/core
    
    Merge reason: add the latest fixes.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit fe4c51b22080691792d3e28d86acb4d4ccb7e8e8
Merge: 72ed62bdc46d 43bece79796c
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Aug 18 21:51:44 2011 +0200

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

commit bdc2209fd246820de2816691ac0e82600885e1a8
Merge: eeca7360f756 3f4460a28fb2
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Aug 14 11:48:29 2011 +0200

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

commit 7676ebbaf21c3828e6315baadb6fcde448aa79b4
Merge: e710574de10b 981c1252691f
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Aug 10 10:20:52 2011 +0200

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

commit e710574de10b181c159a67af75af0245de33a4b9
Merge: a34668f6beb4 9941c96ad869
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Aug 9 16:44:27 2011 +0200

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

commit 6d158f3ec537bd6d3786196b6db97fcc0f973aef
Merge: 3272cab40634 00894ce9b858
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri Aug 5 10:35:55 2011 +0200

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