Merge branch 'rfc/splice/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-04 11:15:42 +01:00

parent a1be621dfa 2cadf9135e

commit 2602c3ba45

4 changed files with 357 additions and 43 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

7

include/linux/ring_buffer.h

View file

118

kernel/trace/ring_buffer.c

View file

274

kernel/trace/trace.c

View file

1

kernel/trace/trace.h

View file