summaryrefslogtreecommitdiffstats
path: root/include/linux/ftrace.h
diff options
context:
space:
mode:
authorIngo Molnar2009-02-19 10:20:17 +0100
committerIngo Molnar2009-02-19 10:20:17 +0100
commit40999096e8b9872199bf56ecd0c4d98397ccaf2f (patch)
treea1019965100c10cae52014c447bfb4d1381ebec9 /include/linux/ftrace.h
parentMerge branch 'linus' into tracing/blktrace (diff)
parenttracing/core: remove unused parameter in tracing_fill_pipe_page() (diff)
parentMerge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadkernel-qcow2-linux-40999096e8b9872199bf56ecd0c4d98397ccaf2f.tar.gz
kernel-qcow2-linux-40999096e8b9872199bf56ecd0c4d98397ccaf2f.tar.xz
kernel-qcow2-linux-40999096e8b9872199bf56ecd0c4d98397ccaf2f.zip
Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing/core