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