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

Merge branch 'linus' into x86/cleanups, to resolve conflict 



Conflicts:
	arch/x86/kernel/kprobes/ftrace.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 21d6a7dc 2c41fab1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment