From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 19 Jul 2018 21:11:52 +0000 (+0200)
Subject: Merge branch 'linus' into x86/timers
X-Git-Tag: for-linus-20180825~141^2~31
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=73ab603f44149ff48889d5109ea9ab64bf38cc69;p=linux-block.git

Merge branch 'linus' into x86/timers

Pick up upstream changes to avoid conflicts
---

73ab603f44149ff48889d5109ea9ab64bf38cc69