]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
commit1ed90cdb6a8ea02c5cb98b9a74a9aefe89720767
treeaedb6d02e53e3cf84cc32fd81db84032cee205e1
parenteedea61f8a644204d4c8d5c50c4815139af76a51
parent5fe213ef8d9b7e55d1d721b224de5e1a0fac0e28
Merge branch 'tip/perf/core' 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.h