diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:47:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:47:45 +0200 |
commit | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (patch) | |
tree | 6c472ae9f709246ee5268e1d71559d07839fb965 /include/linux/ftrace.h | |
parent | tracing: add average time in function to function profiler (diff) | |
parent | NFS: Fix a double free in nfs_parse_mount_options() (diff) | |
download | linux-dev-93776a8ec746cf9d32c36e5a5b23d28d8be28826.tar.xz linux-dev-93776a8ec746cf9d32c36e5a5b23d28d8be28826.zip |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/ftrace.h')
0 files changed, 0 insertions, 0 deletions