Merge branch 'tracing/fastboot' into tracing/ftrace

Browse source

...

This commit is contained in:

Ingo Molnar 2008-11-06 07:43:47 +01:00

parent 3299b4dd11 79a9d461fd

commit 79c81d220c

6 changed files with 66 additions and 38 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

24

include/linux/ftrace.h

View file

4

init/main.c

View file

2

kernel/trace/trace.c

View file

1

kernel/trace/trace.h

View file

36

kernel/trace/trace_boot.c

View file

37

kernel/trace/trace_sched_switch.c

View file