From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 20 Jul 2018 04:43:05 +0000 (+0200)
Subject: Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz... 
X-Git-Tag: for-linus-20180825~156^2~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e5af5ff34cf037ac7bb70976161427dc40bf4a96;p=linux-block.git

Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz/linux into timers/core

Pull the second set of timekeeping things for 4.19 from John Stultz

  * NTP argument clenaups and constification from Ondrej Mosnacek
  * Fix to avoid RTC injecting sleeptime when suspend fails from
    Mukesh Ojha
  * Broading suspsend-timing to include non-stop clocksources that
    aren't currently used for timekeeping from Baolin Wang
---

e5af5ff34cf037ac7bb70976161427dc40bf4a96