]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite5ae3e973b262a6fe2864130f691170a6ac7c49f
tree41fb55cf62d07b425122f9a8b96412c0d8eb99c5
parent9a524d8e0857521be3ca2e135c035fe680c1888e
parent93c8f860a24689d70f00cf3c74d03f94ec22b813
Merge branch 'linus' into smp/hotplug

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