From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 17 Apr 2017 08:55:14 +0000 (+0200)
Subject: Merge branch 'clockevents/4.12' of https://git.linaro.org/people/daniel.lezcano/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=821596a50aba6873ff4ea8fdf2b1515638c3c8a3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Pull clockevents updates from Daniel Lezcano

- Provide a framework to handle errata gracefuly for arm_arch_timer (Mark
   Zyngier)

 - Clarify the DT properties for the rockchip timer and add the clocksource as
   an alternative to the bogus architected timer (Alexander Kochetkov)

 - Rename the Gemini timer to Faraday timer fttmr010 and provide a specific
   initialization for Gemini (Linus Walleij)

 - Add missing newlines in the error message in the timers (Rafał Miłecki)

 - Read the clock once and implement the delay timer on Orion (Russell King)
---

821596a50aba6873ff4ea8fdf2b1515638c3c8a3