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

Add a tracepoint for block request remapping

2009-10-01 21:19:34 +02:00

ftrace.c

function-graph: Allow writing the same val to set_graph_function

2009-12-13 18:37:26 +01:00

Kconfig

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

2009-11-21 14:07:23 +01:00

kmemtrace.c

kmemtrace: Fix up tracer registration

2009-10-01 11:53:44 +02:00

Makefile

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

2009-11-21 14:07:23 +01:00

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

tracing: user local buffer variable for trace branch tracer

2009-10-07 21:53:41 -04:00

trace_clock.c

tracing: do not disable interrupts for trace_clock_local

2009-11-11 23:38:33 -05:00

trace_entries.h

hw-breakpoints: Rewrite the hw-breakpoints layer on top of perf events

2009-11-08 15:34:42 +01:00

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

tracing/filters: Fix to make system filter work

2009-10-29 08:53:20 +01:00

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

tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

2009-10-07 21:52:03 -04:00

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

ksym_tracer: Remove KSYM_SELFTEST_ENTRY

2009-11-08 16:21:01 +01:00

trace_stack.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

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