From: Thomas Gleixner Date: Thu, 19 Jul 2018 21:11:52 +0000 (+0200) Subject: Merge branch 'linus' into x86/timers X-Git-Tag: microblaze-v5.0-rc1~665^2~31 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=73ab603f44149ff48889d5109ea9ab64bf38cc69;p=linux-2.6-microblaze.git Merge branch 'linus' into x86/timers Pick up upstream changes to avoid conflicts --- 73ab603f44149ff48889d5109ea9ab64bf38cc69