968ea6d80e
Conflicts: arch/x86/kernel/io_apic.c kernel/sched.c kernel/sched_stats.h |
||
---|---|---|
.. | ||
ftrace.c | ||
Kconfig | ||
Makefile | ||
ring_buffer.c | ||
trace.c | ||
trace.h | ||
trace_boot.c | ||
trace_branch.c | ||
trace_bts.c | ||
trace_functions.c | ||
trace_functions_graph.c | ||
trace_irqsoff.c | ||
trace_mmiotrace.c | ||
trace_nop.c | ||
trace_power.c | ||
trace_sched_switch.c | ||
trace_sched_wakeup.c | ||
trace_selftest.c | ||
trace_selftest_dynamic.c | ||
trace_stack.c | ||
trace_sysprof.c |