Ingo Molnar ec5e61aabe Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/cpu/perf_event.c Merge reason: Resolve the conflict, pick up fixes Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-04-02 19:38:10 +02:00
..
blktrace.c	blktrace: perform cleanup after setup error	2010-02-28 19:47:19 +01:00
ftrace.c	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-13 14:43:01 -08:00
Kconfig	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
kmemtrace.c	kmemtrace: Fix up tracer registration	2009-10-01 11:53:44 +02:00
Makefile	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
power-traces.c	tracing/power: Remove two exports	2009-12-13 18:37:28 +01:00
ring_buffer_benchmark.c	local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c	2010-01-05 15:34:50 +09:00
ring_buffer.c	ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte align	2010-03-18 23:11:35 -04: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: Add correct/incorrect to sort keys for branch annotation output	2010-02-09 21:35:05 -05:00
trace_clock.c	tracing: Include irqflags headers from trace clock	2010-02-28 19:45:01 +01:00
trace_entries.h	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
trace_event_perf.c	perf: Correctly align perf event tracing buffer	2010-04-01 08:26:30 +02:00
trace_events_filter.c	Merge branch 'perf/urgent' into perf/core	2010-01-29 10:36:22 +01:00
trace_events.c	perf: Drop the obsolete profile naming for trace events	2010-03-10 14:47:18 +01:00
trace_export.c	tracing: Remove show_format and related macros from TRACE_EVENT	2010-01-06 12:08:46 -05:00
trace_functions_graph.c	Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-13 14:40:50 -08:00
trace_functions.c	tracing: switch function prints from %pf to %ps	2009-09-17 15:53:40 -04:00
trace_irqsoff.c	tracing: Add stack trace to irqsoff tracer	2009-12-11 13:19:51 -05:00
trace_kprobe.c	perf: Drop the obsolete profile naming for trace events	2010-03-10 14:47:18 +01:00
trace_ksym.c	ksym_tracer: Remove trace_stat	2009-12-30 07:50:50 +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	tracing/ftrace: make nop-tracer use polling wait for events on pipe	2009-03-23 09:22:15 +01:00
trace_output.c	tracing: Add full state to trace_seq	2009-12-09 14:05:49 -05: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	tracing: pass around ring buffer instead of tracer	2009-09-04 18:59:39 -04:00
trace_sched_wakeup.c	locking: Convert __raw_spin* functions to arch_spin*	2009-12-14 23:55:32 +01:00
trace_selftest_dynamic.c	ftrace: fix dynamic ftrace selftest	2008-05-23 21:13:23 +02:00
trace_selftest.c	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
trace_stack.c	tracing: Fix circular dead lock in stack trace	2010-02-02 10:20:18 -05:00
trace_stat.c	trace_stat: Fix missing entry in stat file	2009-08-17 11:25:09 +02:00
trace_stat.h	tracing/stat: Add stat_release() callback	2009-07-10 12:14:05 +02:00
trace_syscalls.c	perf: Drop the obsolete profile naming for trace events	2010-03-10 14:47:18 +01:00
trace_sysprof.c	perf events, x86/stacktrace: Make stack walking optional	2009-12-17 09:56:19 +01:00
trace_workqueue.c	tracing/workqueues: Add refcnt to struct cpu_workqueue_stats	2009-07-10 12:14:07 +02:00
trace.c	Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-13 14:40:50 -08:00
trace.h	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00