Merge branch 'x86/asm' into x86/urgent

Merge reason: The linker script cleanups are ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/head_32.S
Simple merge

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

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge