Merge branch 'fortglx/4.4/time' of https://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 20 Oct 2015 10:30:53 +0000 (12:30 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 20 Oct 2015 10:36:37 +0000 (12:36 +0200)
Time updates from John Stultz:

     - More 2038 work from Arnd Bergmann around ntp and pps

1  2 
kernel/time/timekeeping.c

Simple merge