Merge branch 'linus' into smp/hotplug
authorThomas Gleixner <tglx@linutronix.de>
Thu, 1 Sep 2016 16:33:46 +0000 (18:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 1 Sep 2016 16:33:46 +0000 (18:33 +0200)
commit0cb7bf61b1e9f05027de58c80f9b46a714d24e35
tree41fb55cf62d07b425122f9a8b96412c0d8eb99c5
parentaa877175e7a9982233ed8f10cb4bfddd78d82741
parent3eab887a55424fc2c27553b7bfe32330df83f7b8
Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.
arch/x86/kernel/smpboot.c