Skip to content
Commit 2f6affe3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.20' of...

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

Pull clockevent updates from Daniel Lezcano:

 - Prefix file names with timer-* (Daniel Lezcano)

 - Remove old CLOCKSOURCE_OF_DECLARE which was replaced by TIMER_OF_DECLARE
   (Daniel Lezcano)

 - Add reset control for dw_apb (Dinh Nguyen)

 - Add the SPDX identifiers for the renesas and sh timers (Kuninori
   Morimoto)

 - Use %pOFn instead of device_node.name (Rob Herring)

 - Fixup 64bits and clocksource width to 32b for sh_cmt (Sergei Shtylyov)

 - Add the R-Car gen3 support (Sergei Shtylyov)
parents 9414229c 1f174a1a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment