Merge branch 'x86/spinlocks' into x86/xen