Patches contributed by Eötvös Lorand University
commit 5cf42f7055648aaba68ce95ecec69128d7fbf65f
Merge: 86dd7909c2c4 a4f18ed11a4d
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 8 16:09:55 2011 +0200
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 86dd7909c2c4ae3f219a9233bf0f095b05632ecf
Merge: d7ebe75b065a cbf74cea070f
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 8 15:49:03 2011 +0200
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
commit 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4
Merge: aef29bf20bd7 aa4a22187587
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jun 4 12:28:05 2011 +0200
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 710054ba25c0d1f8f41c22ce13ba336503fb5318
Merge: 74c355fbdfed b273fa9716aa
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jun 4 12:13:06 2011 +0200
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
commit aef29bf20bd79c73992ab23d5067e9f0448b466e
Merge: 27eb4a1e4a56 7cec0922389e
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 3 10:43:03 2011 +0200
Merge branch 'perf/core' of ssh://k/pub/scm/linux/kernel/git/acme/linux into perf/core
commit 27eb4a1e4a56afacb0540c24084b9e0342f9956b
Merge: 64ce312618ef 55922c9d1b84
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 3 10:41:03 2011 +0200
Merge commit 'v3.0-rc1' into perf/core
Merge reason: merge in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e197f094b7da7d94812492cfcd706d143f1020e5
Merge: f339b9dc1f03 e69c634190dc
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 3 10:27:47 2011 +0200
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into sched/urgent
commit 29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58
Merge: f62508f68d04 23b5c8fa01b7
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri May 27 12:38:52 2011 +0200
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
commit d6a72fe465f4c54654a1d5488daeb820b4ecf275
Merge: b1d2dc3c06d8 b1cff0ad1062
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri May 27 14:28:09 2011 +0200
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576
Merge: 75911c9bd113 b76a06e08d94
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri May 27 14:08:09 2011 +0200
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent