]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - rpmsg/rpmsg.git/commitdiff
Merge branch 'fortglx/4.19/time' of https://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Thu, 12 Jul 2018 20:19:58 +0000 (22:19 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 12 Jul 2018 20:19:58 +0000 (22:19 +0200)
Pull timekeeping updates from John Stultz:

  - Make the timekeeping update more precise when NTP frequency is set
    directly by updating the multiplier.

  - Adjust selftests

1  2 
fs/timerfd.c
include/linux/compat.h
include/linux/syscalls.h
kernel/time/hrtimer.c
kernel/time/posix-cpu-timers.c
kernel/time/time.c
kernel/time/timekeeping.c

diff --cc fs/timerfd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge