Merge branch 'clockevents/4.13-fixes' of http://git.linaro.org/people/daniel.lezcano...
authorIngo Molnar <mingo@kernel.org>
Sun, 13 Aug 2017 09:39:45 +0000 (11:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 13 Aug 2017 09:39:45 +0000 (11:39 +0200)
commitb60bf53abc0323f91ac59b08a7642216281e662e
tree108fd26ab0456686bf76e7637c8f324eb4cb9542
parent216e4a1def29a0d04182875034efb764eb37b8ff
parentadb4f11e0a8f4e29900adb2b7af28b6bbd5c1fa4
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 <mingo@kernel.org>