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)
commitb2c280bdd6ea31be66c9b6a666e71daa49beef75
tree2161a17963b02c9fa097e0fe3337bbd460d5d5ac
parentc8d75aa47dd585c9538a8205e9bb9847e12cfb84
parent090e2edb4171dae4872c4eaae972dd3ccf96d4a8
Merge branch 'fortglx/4.4/time' of https://git.linaro.org/people/john.stultz/linux into timers/core

Time updates from John Stultz:

     - More 2038 work from Arnd Bergmann around ntp and pps
kernel/time/timekeeping.c