]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fortglx/4.13/time' of https://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Wed, 21 Jun 2017 07:08:13 +0000 (09:08 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Jun 2017 07:08:13 +0000 (09:08 +0200)
Merge time(keeping) updates from John Stultz:

  "Just a small set of changes, the biggest changes being the MONOTONIC_RAW
   handling cleanup, and a new kselftest from Miroslav. Also a a clear
   warning deprecating CONFIG_GENERIC_TIME_VSYSCALL_OLD, which affects ppc
   and ia64."


Trivial merge