Ingo Molnar a2e7127153 Merge commit 'v2.6.32-rc6' into perf/core ... Conflicts: tools/perf/Makefile Merge reason: Resolve the conflict, merge to upstream and merge in perf fixes so we can add a dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-11-04 11:59:45 +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-rc6' into perf/core	2009-11-04 11:59:45 +01:00
Kconfig	trivial: Fix duplicated word "options" in comment	2009-09-21 15:14:58 +02:00
kmemtrace.c	kmemtrace: Fix up tracer registration	2009-10-01 11:53:44 +02:00
Makefile	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
power-traces.c	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
ring_buffer_benchmark.c
ring_buffer.c	Merge commit 'v2.6.32-rc6' into perf/core	2009-11-04 11:59:45 +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	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
trace_event_profile.c	tracing: Use free_percpu instead of kfree	2009-10-05 10:57:56 +02: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 'tracing/core' into perf/core	2009-10-15 11:34:00 +02:00
trace_export.c	tracing/events: Add 'signed' field to format files	2009-10-06 15:04:45 +02:00
trace_functions_graph.c	tracing: switch function prints from %pf to %ps	2009-09-17 15:53:40 -04:00
trace_functions.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
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	tracing: Remove markers	2009-09-18 21:22:08 +02:00
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	Merge branch 'tracing/core' into perf/core	2009-10-15 11:34:00 +02: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	tracing/profile: Add filter support	2009-10-15 11:35:23 +02:00