Merge branches 'tracing/ftrace' and 'tracing/syscalls'; commit 'v2.6.29-rc8' into...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 09:23:39 +0000 (10:23 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 09:23:39 +0000 (10:23 +0100)
commit62a394eb77a1ddea73273f53ed8c3ccf6e04f2fb
treeee72d87524b29eb9457b45e02a4587d8fbd9191d
parentd2e82546ae98eee353fae57e389f487586fe380d
parent1b3fa2ce64363c289b3b14723cca7290bf91cfce
Merge branches 'tracing/ftrace' and 'tracing/syscalls'; commit 'v2.6.29-rc8' into tracing/core
kernel/trace/trace.h