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

Merge branch 'linus' into x86/paravirt-spinlocks 



Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 34646bca 5b664cb2
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