summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-02 09:20:44 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-02 09:20:44 +0100
commit222658e08f72cd539d01f3aabdc258c596f487e2 (patch)
tree047099f92b108153b3844c08bcf3ffbffa652c21 /Documentation
parent74bf3cabc306f31ddd02f2c1b0540a6cfcacc593 (diff)
parent65c6dc6adbe7ee0acf207445243400a68c77af15 (diff)
parentc072c24975ec4f0ccfcb6f5c8a8040b6eb75ef8f (diff)
parentd51090b34602a20984ab0312ef04e47069c0aec6 (diff)
parenta838c2ec6ea1f18431da74dfe4978c57355b95f3 (diff)
parentf1eecf0e4f0796911cc076f38fcf05fea0b353d5 (diff)
parent604094f4615180f71da799e7e5b191f5c2a42a28 (diff)
parentf08340c5d68ab621f377c108637e2d8e95b3e5d4 (diff)
downloadlinux-222658e08f72cd539d01f3aabdc258c596f487e2.tar.gz
linux-222658e08f72cd539d01f3aabdc258c596f487e2.tar.bz2
linux-222658e08f72cd539d01f3aabdc258c596f487e2.zip
Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-graph-tracer', 'tracing/markers', 'tracing/powerpc', 'tracing/stack-tracer' and 'tracing/tracepoints' into tracing/core