Merge branch 'tip/tracing/ftrace' of...

Documentation/tracepoints.txt

include/linux/tracepoint.h

include/trace/block.h

include/trace/irq_event_types.h

include/trace/lockdep_event_types.h

include/trace/power.h

include/trace/sched_event_types.h

include/trace/workqueue.h

kernel/trace/events.c

kernel/trace/trace.h

kernel/trace/trace_event_types.h

kernel/trace/trace_events.c

kernel/trace/trace_events_stage_1.h

kernel/trace/trace_events_stage_2.h

kernel/trace/trace_events_stage_3.h

kernel/trace/trace_export.c

kernel/trace/trace_format.h

kernel/trace/trace_selftest.c

samples/tracepoints/tp-samples-trace.h