Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse source

...

This commit is contained in:

Ingo Molnar 2009-03-17 10:37:37 +01:00

parent c269fc8c53 6adaad14d7

commit 4176935b58

6 changed files with 51 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

23

kernel/trace/blktrace.c

View file

2

kernel/trace/ftrace.c

View file

22

kernel/trace/trace.c

View file

2

kernel/trace/trace.h

View file

12

kernel/trace/trace_functions_graph.c

View file

18

kernel/trace/trace_output.c

View file