projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 291d0e5 ab1e77c)
Merge branch 'clockevents/4.20-rc1' of https://git.linaro.org/people/daniel.lezcano...
authorThomas Gleixner <tglx@linutronix.de>
Fri, 2 Nov 2018 20:58:39 +0000 (21:58 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 2 Nov 2018 20:58:39 +0000 (21:58 +0100)
Pull clockevent update from Daniel Lezcano:

 - Add the per cpu timer for the c-sky architecture (Guo Ren)

 - Add the global timer for the c-sky architecture (Guo Ren)


Trivial merge
Linux 6.x block layer and io_uring tree(s)