Ingo Molnar cc0104e877 Merge branch 'linus' into tracing/urgent ... Conflicts: kernel/trace/trace_kprobe.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-12-14 09:16:49 +01:00
..
blktrace.c
ftrace.c	function-graph: Allow writing the same val to set_graph_function	2009-12-13 18:37:26 +01:00
Kconfig
kmemtrace.c
Makefile
power-traces.c	tracing/power: Remove two exports	2009-12-13 18:37:28 +01:00
ring_buffer_benchmark.c	ring-buffer-benchmark: Add parameters to set produce/consumer priorities	2009-11-25 14:14:15 -05:00
ring_buffer.c	ring-buffer: Move resize integrity check under reader lock	2009-12-10 23:20:52 -05:00
trace_boot.c
trace_branch.c
trace_clock.c
trace_entries.h
trace_event_profile.c	tracing: Change event->profile_count to be int type	2009-12-13 18:37:28 +01:00
trace_events_filter.c
trace_events.c	tracing: Move a printk out of ftrace_raw_reg_event_foo()	2009-12-13 18:37:25 +01:00
trace_export.c	tracing: Pull up calls to trace_define_common_fields()	2009-12-13 18:34:23 +01:00
trace_functions_graph.c	tracing: Fix function graph trace_pipe to properly display failed entries	2009-12-09 14:09:06 -05:00
trace_functions.c
trace_hw_branches.c
trace_irqsoff.c
trace_kprobe.c	Merge branch 'linus' into tracing/urgent	2009-12-14 09:16:49 +01:00
trace_ksym.c	Merge branch 'linus' into tracing/urgent	2009-12-14 09:16:49 +01:00
trace_mmiotrace.c
trace_nop.c
trace_output.c	tracing: Add full state to trace_seq	2009-12-09 14:05:49 -05:00
trace_output.h
trace_printk.c
trace_sched_switch.c
trace_sched_wakeup.c
trace_selftest_dynamic.c
trace_selftest.c
trace_stack.c
trace_stat.c
trace_stat.h
trace_syscalls.c	tracing: Move a printk out of ftrace_raw_reg_event_foo()	2009-12-13 18:37:25 +01:00
trace_sysprof.c
trace_workqueue.c
trace.c	tracing: Simplify trace_option_write()	2009-12-13 18:37:28 +01:00
trace.h	tracing: Remove useless trace option	2009-12-13 18:37:27 +01:00