Merge branch 'fortglx/3.5/time' of git://git.linaro.org/people/jstultz/linux into timers/core