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)
commit26eafeaab917dd228d292f362be1577c9b4b2e77
treebd89e0ed1c11635d184c7b497aac6ddd967ebde8
parent4c3711d7fb4763c63b2654f2d07cbe21ca5aadd4
parentd81fa669e3de7eb8a631d7d95dac5fbcb2bf9d4e
Merge branch 'linus' into timers/core

Pick up upstream changes to get the prerequisites for the timer changes.