tree 0e897dc8cee3b884eef194b620c62d8a8fa8594c
parent dba861461f88c12249ac78fb877866c04f99deb3
parent 38aef31ce7773624c8f09ff58c4c27b3b955faaf
author Ingo Molnar <mingo@kernel.org> 1389532411 +0100
committer Ingo Molnar <mingo@kernel.org> 1389532411 +0100

Merge branch 'fortglx/3.14/time' of git://git.linaro.org/people/john.stultz/linux into timers/core

Pull timekeeping updates from John Stultz.

Signed-off-by: Ingo Molnar <mingo@kernel.org>