Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
blktrace.c	blktrace: perform cleanup after setup error	2010-02-28 19:47:19 +01:00
ftrace.c	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:20:25 -08:00
Kconfig	Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core	2010-02-27 10:06:10 +01:00
kmemtrace.c	kmemtrace: Fix up tracer registration	2009-10-01 11:53:44 +02:00
Makefile	perf events: Remove CONFIG_EVENT_PROFILE	2009-12-28 10:33:06 +01:00
power-traces.c	tracing/power: Remove two exports	2009-12-13 18:37:28 +01:00
ring_buffer.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +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
trace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
trace.h	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +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: Add correct/incorrect to sort keys for branch annotation output	2010-02-09 21:35:05 -05:00
trace_clock.c	locking: Convert __raw_spin* functions to arch_spin*	2009-12-14 23:55:32 +01: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	perf: Factorize trace events raw sample buffer operations	2010-01-29 02:02:57 +01:00
trace_events.c	tracing: Simplify memory recycle of trace_define_field	2010-02-25 10:42:55 -05:00
trace_events_filter.c	Merge branch 'perf/urgent' into perf/core	2010-01-29 10:36:22 +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.c	tracing: switch function prints from %pf to %ps	2009-09-17 15:53:40 -04:00
trace_functions_graph.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
trace_hw_branches.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
trace_irqsoff.c	tracing: Add stack trace to irqsoff tracer	2009-12-11 13:19:51 -05:00
trace_kprobe.c	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:20:25 -08: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
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.c	locking: Convert __raw_spin* functions to arch_spin*	2009-12-14 23:55:32 +01:00
trace_selftest_dynamic.c
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	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:20:25 -08: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