| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Thu Sep 01 18:33:46 2016 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Thu Sep 01 18:33:46 2016 +0200 |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 [diff] | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 [diff] |
Merge branch 'linus' into smp/hotplug Apply upstream changes to avoid conflicts with pending patches.