Ingo Molnar 7fd52392c5 Merge branch 'linus' into perf/urgent ... Merge reason: we need to fix a non-trivial merge conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2012-03-26 17:19:03 +02:00
..
blktrace.c
ftrace.c
Kconfig
Makefile
power-traces.c
ring_buffer_benchmark.c
ring_buffer.c
rpm-traces.c
trace_branch.c
trace_clock.c
trace_entries.h
trace_event_perf.c
trace_events_filter_test.h
trace_events_filter.c
trace_events.c
trace_export.c
trace_functions_graph.c
trace_functions.c
trace_irqsoff.c
trace_kdb.c
trace_kprobe.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
trace_workqueue.c
trace.c
trace.h