Ingo Molnar 3272cab406 Merge branch 'linus' into perf/urgent ...

Merge reason: Include most of the merge window trees, to do fixes on top.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2011-08-05 10:33:55 +02:00

..

blktrace.c

…

ftrace.c

…

Kconfig

…

Makefile

…

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

…

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

…