Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8293dd6f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/core' into tracing/ftrace 



Semantic merge:

  kernel/trace/trace_functions_graph.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 631595fb 467c88fe
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment