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

Conflicts:
	include/asm-x86/spinlock.h