Merge branch 'clockevents/4.20-rc1' of https://git.linaro.org/people/daniel.lezcano...
commitbff9a1076adfb787036ced707fc28cfa578aee99
authorThomas Gleixner <tglx@linutronix.de>
Fri, 2 Nov 2018 20:58:39 +0000 (2 21:58 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 2 Nov 2018 20:58:39 +0000 (2 21:58 +0100)
treefd9acd5eda2ab28189536a43266e763d2c05f50e
parent291d0e5d81e101392379217b06251fe8c27f1f80
parentab1e77c3f590536b2659c097980efe6e8f713921
Merge branch 'clockevents/4.20-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

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)