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

Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core 

Conflicts:
	arch/parisc/kernel/irq.c
parents b478b782 62395efd 5bee17f1
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