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

Merge branch 'linus' into x86/tracehook



Conflicts:
	arch/x86/Kconfig

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 71998e83 b635acec
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