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

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core 

Conflicts:
	kernel/trace/ring_buffer.c
parents d844222a 3e89c7bb c1e7abbc
Expand all Hide whitespace changes
Inline Side-by-side
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