From: Ingo Molnar Date: Sun, 13 Aug 2017 09:39:45 +0000 (+0200) Subject: Merge branch 'clockevents/4.13-fixes' of http://git.linaro.org/people/daniel.lezcano... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b60bf53abc0323f91ac59b08a7642216281e662e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'clockevents/4.13-fixes' of git.linaro.org/people/daniel.lezcano/linux into timers/urgent Pull clockevents fixes from Daniel Lezcano: " - Fix error check against IS_ERR() instead of NULL for the timer-of code (Dan Carpenter) - Fix infinite recusion with ftrace for the ARM architected timer (Ding Tianhong) - Fix the error code return in the em_sti's probe function (Gustavo A. R. Silva) - Fix Kconfig dependency for the pistachio driver (Matt Redfearn) - Fix mem frame loop initialization for the ARM architected timer (Matthias Kaehlcke)" Signed-off-by: Ingo Molnar --- b60bf53abc0323f91ac59b08a7642216281e662e