Ingo Molnar a7b63425a4 Merge branch 'perf/core' into perf/probes ...

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

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

2009-11-17 10:17:47 +01:00

..

blktrace.c

Add a tracepoint for block request remapping

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

ftrace.c

Merge commit 'v2.6.32-rc7' into perf/core

2009-11-15 09:50:41 +01:00

Kconfig

tracing/kprobes: Rename Kprobe-tracer to kprobe-event

2009-11-04 13:02:48 +01:00

kmemtrace.c

kmemtrace: Fix up tracer registration

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

Makefile

tracing/kprobes: Rename Kprobe-tracer to kprobe-event

2009-11-04 13:02:48 +01:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

Merge commit 'v2.6.32-rc7' into perf/core

2009-11-15 09:50:41 +01: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

…

trace_entries.h

…

trace_event_profile.c

tracing, perf_events: Protect the buffer from recursion in perf

2009-11-08 10:31:42 +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

Merge branch 'perf/core' into perf/probes

2009-10-23 08:23:20 +02:00

trace_export.c

Merge branch 'perf/core' into perf/probes

2009-10-23 08:23:20 +02:00

trace_functions_graph.c

…

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

tracing, perf_events: Protect the buffer from recursion in perf

2009-11-08 10:31:42 +01:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

tracing: Fix trace_seq_printf() return value

2009-10-24 11:07:50 +02: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

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, perf_events: Protect the buffer from recursion in perf

2009-11-08 10:31:42 +01:00

trace_sysprof.c

…

trace_workqueue.c

…

trace.c

Merge commit 'v2.6.32-rc6' into perf/core

2009-11-04 11:59:45 +01:00

trace.h

Merge branch 'perf/core' into perf/probes

2009-10-23 08:23:20 +02:00