Merge branch 'x86/asm' into x86/urgent

Merge reason: it's stable so lets push it upstream.

Signed-off-by: Ingo Molnar <[email protected]>

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

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

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