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

Browse source

...

This commit is contained in:

Ingo Molnar 2009-12-10 08:18:41 +01:00

parent 2b876f95d0 f2942487ff

commit 788d70dce0

6 changed files with 248 additions and 59 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

1

include/linux/ftrace_event.h

View file

7

include/linux/trace_seq.h

View file

57

kernel/trace/trace.c

View file

2

kernel/trace/trace.h

View file

167

kernel/trace/trace_functions_graph.c

View file

75

kernel/trace/trace_output.c

View file