Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc block/blktrace.c
Simple merge

diff --cc include/linux/blktrace_api.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/slab_def.h
Simple merge

diff --cc kernel/relay.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc scripts/Makefile.build
Simple merge