projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa87717 3eab887)
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 patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/smpboot.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.