Merge branch 'linus' into x86/timers
authorThomas Gleixner <tglx@linutronix.de>
Thu, 19 Jul 2018 21:11:52 +0000 (23:11 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 19 Jul 2018 21:11:52 +0000 (23:11 +0200)
commit73ab603f44149ff48889d5109ea9ab64bf38cc69
tree9550d8fb31ddf6dffedf1f602ed44769e529c1d3
parent41afb1dfad4d6af0c716746f6a15f3230482955c
parentfb7d1bcf1602b46f37ada72178516c01a250e434
Merge branch 'linus' into x86/timers

Pick up upstream changes to avoid conflicts