Merge branch 'linus' into x86/cleanups

Pull in upstream changes so we can apply depending patches.

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

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

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

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

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