Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 5 Oct 2017 12:42:39 +0000 (14:42 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 5 Oct 2017 12:42:39 +0000 (14:42 +0200)
Pick up upstream changes to get the prerequisites for the timer changes.


Trivial merge