Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:49:21 +0000 (08:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:49:21 +0000 (08:49 +0100)
commitf0461d0146ee30927bc7efa2ae24ea8c6693b725
tree6a6b416c76c0e1a569af5531454fb45fe06e07ba
parent66eafebc1086014709dc38f52ddcb3d67d9b346c
parent48d68b20d00865035b8b65e69af343d0f53fac9d
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
kernel/trace/ftrace.c