]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit66a05f944b1156b2279eb9d5b7a7f69282cd26c3
tree2169cbd29d5d9a4cbc7104b2a744a95ba746c50d
parent63bd036c708a12d469838e3b7019496ac5171aee
parent04ec1b6314c4f89f4b47dd9ea05e2e6f010b366f
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/trace/ftrace.c
kernel/trace/trace_kprobe.c