Merge branch 'linus' into x86/cleanups
authorThomas Gleixner <tglx@linutronix.de>
Sat, 19 Dec 2015 10:49:13 +0000 (11:49 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 Dec 2015 10:49:13 +0000 (11:49 +0100)
commit0fa85119cd480c1ded7a81ed64f723fe16a15355
tree8648434601c5112a1d9ab091ab11507fe88e0962
parentd6ccc3ec95251d8d3276f2900b59cbc468dd74f4
parent1eab0e42450c6038e2bb17da438370fe639973f3
Merge branch 'linus' into x86/cleanups

Pull in upstream changes so we can apply depending patches.
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/x86_init.h
arch/x86/kernel/smpboot.c
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c