OSDN Git Service

Merge branch 'fortglx/4.14/time' of https://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Sun, 20 Aug 2017 09:46:46 +0000 (11:46 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 20 Aug 2017 09:46:46 +0000 (11:46 +0200)
commit4e2a809703e2b2300438a425b0a3f2013b55fcc6
treeb3233970c706fdd93f9d381c1f48186fe0f8a252
parent3cf294962df8fcde710eb5e762e0929e2ba49947
parent47b4a457e4cc816b3fdd2ee55c65fda8ea6de051
Merge branch 'fortglx/4.14/time' of https://git.linaro.org/people/john.stultz/linux into timers/core

Pull timekeepig updates from John Stultz

 - kselftest improvements

 - Use the proper timekeeper in the debug code

 - Prevent accessing an unavailable wakeup source in the alarmtimer sysfs
   interface.