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)
Apply upstream changes to avoid conflicts with pending patches.

1  2 
arch/x86/kernel/smpboot.c

Simple merge
This page took 0.025643 seconds and 5 git commands to generate.