From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 20 Jun 2017 10:35:36 +0000 (+0200)
Subject: Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux... 
X-Git-Tag: v4.13-rc1~191^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e707eb762cf38b63402c1a124192f648a0629168;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core

Pull clockevent changes from Daniel Lezcano:

 - Factored out moxart, aspeed, cortina drivers into a generic timer fttrm010.
   Take the opportunity to add the delay timer (Linus Walleij)

 - Saved / restored tcb atmel context at suspend/resume (Alexandre Belloni)

 - Added ast2500 compatible string and fixed aspeed2500 initialization (Daniel
   Lezcano)

 - Added clock names property for aspeed (Andrew Jeffery)

 - Renamed clocksource_of to timer_of (Daniel Lezcano)

 - Added a common timer init routine (Daniel Lezcano)
---

e707eb762cf38b63402c1a124192f648a0629168