]> 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)
commit3450c32665e3b1e19a51cb1ff3e7e743871de3d0
tree2169cbd29d5d9a4cbc7104b2a744a95ba746c50d
parent46fed65fb513eedeaa56cfb48afe6f16a0656b59
parentc17325d523d538e62c789bd3b66b7639dd61cb01
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