Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

Browse source

Conflicts:
	include/linux/ftrace.h

...

This commit is contained in:

Ingo Molnar 2008-12-19 09:42:40 +01:00

parent c71dd42db2 6d102bc68f 3d9101e925

commit 30cd324e97

234 changed files with 4051 additions and 2674 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

32

kernel/audit.c

View file

24

kernel/auditsc.c

View file

2

kernel/cgroup.c

View file

16

kernel/fork.c

View file

2

kernel/latencytop.c

View file

2

kernel/posix-cpu-timers.c

View file

2

kernel/power/swap.c

View file

7

kernel/relay.c

View file

2

kernel/sched.c

View file

6

kernel/sched_clock.c

View file

2

kernel/softlockup.c

View file

22

kernel/time/timekeeping.c

View file

4

kernel/trace/ring_buffer.c

View file

39

kernel/trace/trace.c

View file