Merge commit 'origin/x86/urgent' into x86/asm

diff --cc arch/x86/include/asm/lguest.h
Simple merge

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

diff --cc arch/x86/kernel/cpu/common.c
Simple merge