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

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

Conflicts:
	tools/testing/selftests/x86/Makefile
	tools/testing/selftests/x86/run_x86_tests.sh
parents 52648e83 c0655fe9
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