projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3058758 39232ed)
Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz...
authorThomas Gleixner <tglx@linutronix.de>
Fri, 20 Jul 2018 04:43:05 +0000 (06:43 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 20 Jul 2018 04:43:05 +0000 (06:43 +0200)
commite5af5ff34cf037ac7bb70976161427dc40bf4a96
tree3a0c3f8e859562c333e5229ac9fe09d004a45405tree | snapshot
parent30587589251a00974115e0815ac316980f48dbb5commit | diff
parent39232ed5a1793f67b11430c43ed8a9ed6e96c6ebcommit | diff
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
John Crispins staging tree