From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 16 Apr 2019 13:56:46 +0000 (+0200)
Subject: Merge tag 'timers-v5.1-rc6' of https://git.linaro.org/people/daniel.lezcano/linux... 
X-Git-Tag: v5.4-rc1~1201^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c09099188501fd9185b58e79f7c46a15301582c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'timers-v5.1-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevent/clocksource fixes from Daniel Lezcano:

 - Fix TIMER_OF missing option dependency for npcm (Arnd Bergmann)

 - Remove a pointless macro call for arm_arch_timer (Yangtao Li)

 - Fix wrong compatible string for oxnas (Neil Armstrong)

 - Fix compilation warning by removing a dead function on omap (Nathan Chancellor)
---

1c09099188501fd9185b58e79f7c46a15301582c