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
Makefile
power-traces.c
ring_buffer_benchmark.c
ring_buffer.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
trace_boot.c
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
trace_entries.h
trace_event_profile.c
trace_events_filter.c
trace_events.c	tracing: Simplify memory recycle of trace_define_field	2010-02-25 10:42:55 -05:00
trace_export.c
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_functions.c
trace_hw_branches.c
trace_irqsoff.c
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
trace_mmiotrace.c
trace_nop.c
trace_output.c
trace_output.h
trace_printk.c
trace_sched_switch.c
trace_sched_wakeup.c
trace_selftest_dynamic.c
trace_selftest.c
trace_stack.c
trace_stat.c
trace_stat.h
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
trace_workqueue.c
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