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

Merge branch 'x86/build' into x86/asm, to fix up conflicts 



Conflicts:
	arch/x86/entry/syscalls/Makefile

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