Loading
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
Conflicts: include/linux/ftrace.h
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts: include/linux/ftrace.h