From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 31 Mar 2017 07:48:00 +0000 (+0200)
Subject: Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux... 
X-Git-Tag: for-linus-4.12b-rc0b-tag~74^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9005615bafbe03075f4e4fe10874b7abe1918782;p=users%2Fdwmw2%2Flinux.git

Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux into timers/core

Pull timekeeping changes from John Stultz:

 Main changes are the initial steps of Nicoli's work to make the clockevent
 timers be corrected for NTP adjustments. Then a few smaller fixes that
 I've queued, and adding Stephen Boyd to the maintainers list for
 timekeeping.
---

9005615bafbe03075f4e4fe10874b7abe1918782