]> 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)
commit26ae7ec0d1729652310cb94ee731d3750da769f4
treeaedb6d02e53e3cf84cc32fd81db84032cee205e1
parentf618631ab99d5bb3bf9803e0c9115212629cc0dc
parentb46054ab0754980b61b4a815f5ba567aa63de939
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