summaryrefslogtreecommitdiff
path: root/include/linux/timekeeping.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-03-31 10:48:00 +0300
committerThomas Gleixner <tglx@linutronix.de>2017-03-31 10:48:00 +0300
commit9005615bafbe03075f4e4fe10874b7abe1918782 (patch)
tree25e73a4d8de8266346bb140b75ba0436080e5ab3 /include/linux/timekeeping.h
parent016da20148a1692e34d35d1f1787400a2a2d2c58 (diff)
parent0107042768658fea9f5f5a9c00b1c90f5dab6a06 (diff)
downloadlinux-9005615bafbe03075f4e4fe10874b7abe1918782.tar.xz
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 'include/linux/timekeeping.h')
0 files changed, 0 insertions, 0 deletions