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

Merge branch 'x86/asm' into x86/mm, to resolve conflicts 



 Conflicts:
	tools/testing/selftests/x86/Makefile

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents dcb32d99 be8a18e2
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