projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41afb1d fb7d1bc)
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)
Pick up upstream changes to avoid conflicts


Trivial merge
Domain: System / Kernel;