Ingo Molnar 64edbc5620 Merge branch 'tracing/ftrace' into tracing/core ...

Merge reason: this mini-topic had outstanding problems that delayed
              its merge, so it does not fast-forward.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-04 13:59:40 +02:00

..

blktrace.c

blktrace: remove debugfs entries on bad path

2009-05-19 10:29:21 +02:00

ftrace.c

ftrace: do not profile functions when disabled

2009-06-01 23:26:23 -04:00

Kconfig

tracing: combine the default tracers into one config

2009-06-01 23:23:55 -04:00

kmemtrace.c

…

Makefile

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00

ring_buffer_benchmark.c

ring-buffer: check for divide by zero in ring-buffer-benchmark

2009-05-11 13:22:26 -04:00

ring_buffer.c

ring-buffer: move code around to remove some branches

2009-05-11 23:33:06 -04:00

trace_boot.c

…

trace_branch.c

Merge branch 'linus' into tracing/core

2009-05-07 11:17:34 +02:00

trace_clock.c

…

trace_event_profile.c

…

trace_event_types.h

…

trace_events_filter.c

tracing/events: introduce __dynamic_array()

2009-06-01 23:25:15 -04:00

trace_events.c

ftrace: clean up of using ftrace_event_enable_disable()

2009-05-26 03:30:31 +02:00

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_hw_branches.c

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00

trace_irqsoff.c

…

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

tracing: add exports to use __print_symbolic and __print_flags from a module

2009-06-01 23:25:29 -04:00

trace_output.h

tracing: add trace_event_read_lock()

2009-05-25 23:53:41 +02:00

trace_power.c

Merge branch 'linus' into tracing/core

2009-05-07 11:17:34 +02:00

trace_printk.c

…

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_stack.c

…

trace_stat.c

tracing/stat: remove unappropriate safe walk on list

2009-06-02 01:18:33 +02:00

trace_stat.h

…

trace_syscalls.c

…

trace_sysprof.c

…

trace_workqueue.c

trace_workqueue: remove blank line between each cpu

2009-06-02 01:14:26 +02:00

trace.c

tracing: make trace pipe recognize latency format flag

2009-06-01 23:26:02 -04:00

trace.h

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00