Merge branch 'tracing/mmiotrace' into auto-ftrace-next