aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-17 09:36:22 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-17 09:36:22 +0100
commit3f8e402f34ecc7d1d00b54703d3baa401b8bdd78 (patch)
treeb1f515a1c5426809c076dd854f9385efb750683b /kernel/trace
parent072b40a15616fe6bea68466e6bffcfcbf5c8f26f (diff)
parente7d3737ea1b102030f44e96c97754101e41515f0 (diff)
parent227a837567e339c74d9d4243d03a29bd943a018c (diff)
parent5821e1b74f0d08952cb5da4bfd2d9a388d8df58e (diff)
Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core