Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
commit6113e45f831616de98c54a005260223b21bcb6b9
tree0d56dbfae392f89b33c2ae6a36a5cc1ea1c1c988
parent84bb671dc46d77d665d2b5e74539e81b2129bb3e
parent5168ae50a66e3ff7184c2b16d661bd6d70367e50
Merge branch 'tip/perf/core-3' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/sched.c
kernel/trace/ring_buffer.c
kernel/trace/trace.c