diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
| commit | e5af5ff34cf037ac7bb70976161427dc40bf4a96 (patch) | |
| tree | 3a0c3f8e859562c333e5229ac9fe09d004a45405 /drivers/clocksource/timer-keystone.c | |
| parent | 30587589251a00974115e0815ac316980f48dbb5 (diff) | |
| parent | 39232ed5a1793f67b11430c43ed8a9ed6e96c6eb (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
Diffstat (limited to 'drivers/clocksource/timer-keystone.c')
0 files changed, 0 insertions, 0 deletions