]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tracing/ftrace' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (15:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (15:58 +0200)
commit0dd2df806b9283fafe767be7b182d5fb9313fe09
treeb3d17a2d068737ec07727b28e93c7d374c27721b
parentb50ebe420f4c519fc9c11a4d8ce66e1d519f0515
parentad6ed54a36c2a290b7860363232310d25c4ee4ad
Merge branch 'tracing/ftrace' into auto-ftrace-next
kernel/trace/trace.c
kernel/trace/trace.h