Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus' into tracing/core

Browse source

...

This commit is contained in:

Ingo Molnar 2009-02-04 20:45:41 +01:00

parent 939b366977 79fb0768fb 229c4ef8ae

commit ce70a0b472

4 changed files with 70 additions and 18 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

kernel/trace/Kconfig

View file

5

kernel/trace/ftrace.c

View file

65

kernel/trace/trace.c

View file

11

kernel/trace/trace_boot.c

View file