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

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

Conflicts:
	kernel/trace/trace_mmiotrace.c
parents 5fb896a4 f9aa28ad
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