Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return...
authorIngo Molnar <mingo@elte.hu>
Mon, 17 Nov 2008 08:36:22 +0000 (09:36 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 17 Nov 2008 08:36:22 +0000 (09:36 +0100)
commit3f8e402f34ecc7d1d00b54703d3baa401b8bdd78
treeb1f515a1c5426809c076dd854f9385efb750683b
parent072b40a15616fe6bea68466e6bffcfcbf5c8f26f
parente7d3737ea1b102030f44e96c97754101e41515f0
parent227a837567e339c74d9d4243d03a29bd943a018c
parent5821e1b74f0d08952cb5da4bfd2d9a388d8df58e
Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core
kernel/module.c
kernel/trace/ftrace.c
kernel/trace/trace_branch.c