Merge branch 'x86/alternatives' into x86/core

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc include/asm-x86/futex.h
Simple merge

diff --cc include/asm-x86/spinlock.h
Simple merge