summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-04 09:07:44 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-04 09:07:44 +0100
commitb29144c317fb748dae6d72c0f88eda9d43165b8d (patch)
tree6752c13edb19fb4d992d0202b0c2276d6734b373
parentMerge commit 'v2.6.28-rc7' into tracing/core (diff)
parentftrace: fix race in function graph during fork (diff)
parenttracing/function-graph-tracer: enabled by default (diff)
downloadlinux-b29144c317fb748dae6d72c0f88eda9d43165b8d.tar.xz
linux-b29144c317fb748dae6d72c0f88eda9d43165b8d.zip
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core