Ingo Molnar 9676e73a9e Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core ...

Conflicts:
	kernel/trace/ftrace.c

[ We conflicted here because we backported a few fixes to
  tracing/urgent - which has different internal APIs. ]

2008-11-19 10:04:25 +01:00

..

ftrace.c

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

2008-11-19 09:00:50 +01:00

Kconfig

tracing/function-return-tracer: support for dynamic ftrace on function return tracer

2008-11-16 07:57:38 +01:00

Makefile

ftrace: rename trace_unlikely.c file

2008-11-12 22:28:40 +01:00

ring_buffer.c

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

2008-11-19 10:04:25 +01:00

trace_boot.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_branch.c

Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core

2008-11-17 09:36:22 +01:00

trace_functions_return.c

tracing/function-return-tracer: support for dynamic ftrace on function return tracer

2008-11-16 07:57:38 +01:00

trace_functions.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_irqsoff.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_mmiotrace.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_nop.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_sched_switch.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_sched_wakeup.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_selftest_dynamic.c

…

trace_selftest.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_stack.c

ftrace: insert in the ftrace_preempt_disable()/enable() functions

2008-11-04 10:09:49 +01:00

trace_sysprof.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace.c

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

2008-11-19 10:04:25 +01:00

trace.h

Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

2008-11-18 08:52:13 +01:00