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

Merge branch 'linus' into tracing/hw-breakpoints 



Conflicts:
	arch/x86/kernel/process_64.c

Semantic conflict fixed in:
	arch/x86/kvm/x86.c

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