Commits
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core Conflicts: include/linux/ftrace.h
Showing diff toc71dd42db2c
Ingo Molnar committed c71dd42db2ctracing: fix warnings in kernel/trace/trace_sched_switch.c these warnings: kernel/t...
Lai Jiangshan committed 6d102bc68f3tracing/ring-buffer: remove unused ring_buffer size Impact: remove dead code struct r...
Thomas Gleixner committed 3d9101e9252trace: fix task state printout Impact: fix occasionally incorrect trace output The tr...