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

Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen 

Conflicts:
	include/asm-x86/spinlock.h
parents 365d46dc 84e9c95a 4c7145a1
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