Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 09:55:43 +0000 (11:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 09:55:43 +0000 (11:55 +0200)
commit931da6137e8e8c622f59251e8b645467aea293f1
tree2169cbd29d5d9a4cbc7104b2a744a95ba746c50d
parent5d67be97f8903d05ce53597fb5f3bc25a45e8026
parent1fd8df2c3970c9e7e4e262354154ee39e58bdd7c
Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/trace/ftrace.c
kernel/trace/trace_kprobe.c