Ingo Molnar e0cb4ebcd9 Merge branch 'tracing/urgent' into tracing/ftrace ...

Conflicts:
	kernel/trace/trace.c

2008-11-11 09:40:18 +01:00

..

ftrace.c

ftrace: fix set_ftrace_filter

2008-11-08 09:51:02 +01:00

Kconfig

ftrace: add quick function trace stop

2008-11-06 07:50:51 +01:00

Makefile

ftrace: rename FTRACE to FUNCTION_TRACER

2008-10-20 18:27:03 +02:00

ring_buffer.c

Merge branch 'tracing/urgent' into tracing/ftrace

2008-11-11 09:40:18 +01:00

trace_boot.c

ftrace: remove ctrl_update method

2008-11-08 09:51:34 +01:00

trace_functions.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_irqsoff.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_mmiotrace.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_nop.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_sched_switch.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_sched_wakeup.c

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace_selftest_dynamic.c

ftrace: fix dynamic ftrace selftest

2008-05-23 21:13:23 +02:00

trace_selftest.c

ftrace: force pass of preemptoff selftest

2008-11-08 09:51:49 +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

ftrace: remove trace array ctrl

2008-11-08 09:51:39 +01:00

trace.c

Merge branch 'tracing/urgent' into tracing/ftrace

2008-11-11 09:40:18 +01:00

trace.h

ftrace: display start of CPU buffer in trace output

2008-11-08 09:51:54 +01:00