Skip to content
GitLab
Commit e0cb4ebc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/urgent' into tracing/ftrace 

Conflicts:
	kernel/trace/trace.c
parents a309720c 45b86a96
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment