Merge branch 'linus' into x86/asm, before applying dependent patch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/ia32/ia32entry.S
Simple merge

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

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

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

diff --cc arch/x86/xen/enlighten.c
Simple merge