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

Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core 

Conflicts:
	include/linux/ftrace.h
parents c71dd42d 6d102bc6 3d9101e9
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