Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core