Rusty Russell 968ea6d80e Merge ../linux-2.6-x86 ...

Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h

2008-12-13 21:55:51 +10:30

..

ftrace.c

tracing/function-graph-tracer: append the tracing_graph_flag

2008-12-08 15:11:45 +01:00

Kconfig

tracing/function-graph-tracer: enabled by default

2008-12-03 10:33:58 +01:00

Makefile

Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core

2008-11-27 10:56:13 +01:00

ring_buffer.c

ring-buffer: change "page" variable names to "bpage"

2008-12-03 08:56:24 +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

ftrace: replace raw_local_irq_save with local_irq_save

2008-12-03 08:56:19 +01:00

trace_bts.c

x86, bts, ftrace: a BTS ftrace plug-in prototype

2008-11-25 17:31:13 +01:00

trace_functions_graph.c

tracing/function-graph-tracer: implement a print_headers function

2008-12-08 13:24:52 +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/function-graph-tracer: handle ftrace_printk entries

2008-12-04 10:18:39 +01:00

trace_nop.c

tracing/ftrace: make nop tracer using tracer flags

2008-11-18 11:10:59 +01:00

trace_power.c

tracing: add "power-tracer": C/P state tracer to help power optimization

2008-11-26 08:29:32 +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

ftrace: fix dynamic ftrace selftest

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

trace_selftest.c

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

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

trace_stack.c

trace: fix output of stack trace

2008-12-03 17:15:02 +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 ../linux-2.6-x86

2008-12-13 21:55:51 +10:30

trace.h

tracing/ftrace: fix the check of ftrace_trace_task

2008-12-05 14:47:43 +01:00