From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 1 Sep 2016 16:33:46 +0000 (+0200)
Subject: Merge branch 'linus' into smp/hotplug
X-Git-Tag: v4.9-rc1~150^2~45
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0cb7bf61b1e9f05027de58c80f9b46a714d24e35;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.
---

0cb7bf61b1e9f05027de58c80f9b46a714d24e35