Ingo Molnar 96200591a3 Merge branch 'tracing/hw-breakpoints' into perf/core ... Conflicts: arch/x86/kernel/kprobes.c kernel/trace/Makefile Merge reason: hw-breakpoints perf integration is looking good in testing and in reviews, plus conflicts are mounting up - so merge & resolve. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-11-21 14:07:23 +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	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, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
ring_buffer.c	Merge commit 'v2.6.32-rc7' into perf/core	2009-11-15 09:50:41 +01:00
ring_buffer_benchmark.c
trace.c	Merge commit 'v2.6.32-rc6' into perf/core	2009-11-04 11:59:45 +01:00
trace.h	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
trace_boot.c	tracing: add filter event logic to special, mmiotrace and boot tracers	2009-09-12 23:34:04 -04:00
trace_branch.c	tracing: user local buffer variable for trace branch tracer	2009-10-07 21:53:41 -04:00
trace_clock.c	tracing: optimize global_trace_clock cachelines	2009-09-15 12:24:22 -04: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, perf_events: Protect the buffer from recursion in perf	2009-11-08 10:31:42 +01:00
trace_events.c	Merge branch 'perf/core' into perf/probes	2009-10-23 08:23:20 +02:00
trace_events_filter.c	tracing/filters: Fix to make system filter work	2009-10-29 08:53:20 +01:00
trace_export.c	Merge branch 'perf/core' into perf/probes	2009-10-23 08:23:20 +02:00
trace_functions.c	tracing: switch function prints from %pf to %ps	2009-09-17 15:53:40 -04:00
trace_functions_graph.c	tracing: switch function prints from %pf to %ps	2009-09-17 15:53:40 -04:00
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	tracing: do not update tracing_max_latency when tracer is stopped	2009-09-12 21:45:17 -04:00
trace_kprobe.c	tracing, perf_events: Protect the buffer from recursion in perf	2009-11-08 10:31:42 +01:00
trace_ksym.c	ksym_tracer: Support read accesses independent of read/write.	2009-11-10 11:10:08 +01:00
trace_mmiotrace.c	tracing: add filter event logic to special, mmiotrace and boot tracers	2009-09-12 23:34:04 -04:00
trace_nop.c
trace_output.c	tracing: Fix trace_seq_printf() return value	2009-10-24 11:07:50 +02:00
trace_output.h	tracing: consolidate code between trace_output.c and trace_function_graph.c	2009-09-11 14:24:13 -04:00
trace_printk.c	tracing: Remove markers	2009-09-18 21:22:08 +02:00
trace_sched_switch.c
trace_sched_wakeup.c	tracing: do not update tracing_max_latency when tracer is stopped	2009-09-12 21:45:17 -04:00
trace_selftest.c	ksym_tracer: Remove KSYM_SELFTEST_ENTRY	2009-11-08 16:21:01 +01:00
trace_selftest_dynamic.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