Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c
Showing
This diff is collapsed.
arch/ia64/kernel/ftrace.c
0 → 100644
arch/um/include/asm/ftrace.h
0 → 100644
include/asm-frv/ftrace.h
0 → 100644
include/asm-m32r/ftrace.h
0 → 100644
include/asm-mn10300/ftrace.h
0 → 100644
This diff is collapsed.
include/linux/trace_clock.h
0 → 100644
include/trace/irq.h
0 → 100644
include/trace/kmemtrace.h
0 → 100644
include/trace/lockdep.h
0 → 100644
include/trace/power.h
0 → 100644
This diff is collapsed.
include/trace/trace_events.h
0 → 100644
include/trace/workqueue.h
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/events.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
kernel/trace/kmemtrace.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_clock.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_events.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_export.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_output.c
0 → 100644
This diff is collapsed.
kernel/trace/trace_output.h
0 → 100644
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_printk.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
kernel/trace/trace_stat.c
0 → 100644
This diff is collapsed.
kernel/trace/trace_stat.h
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment