diff options
author | Thomas Gleixner | 2017-03-31 09:48:00 +0200 |
---|---|---|
committer | Thomas Gleixner | 2017-03-31 09:48:00 +0200 |
commit | 9005615bafbe03075f4e4fe10874b7abe1918782 (patch) | |
tree | 25e73a4d8de8266346bb140b75ba0436080e5ab3 /arch/alpha | |
parent | hrtimer: Remove hrtimer_peek_ahead_timers() leftovers (diff) | |
parent | sysrq: Reset the watchdog timers while displaying high-resolution timers (diff) | |
download | kernel-qcow2-linux-9005615bafbe03075f4e4fe10874b7abe1918782.tar.gz kernel-qcow2-linux-9005615bafbe03075f4e4fe10874b7abe1918782.tar.xz kernel-qcow2-linux-9005615bafbe03075f4e4fe10874b7abe1918782.zip |
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.
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions