| commit | 1c09099188501fd9185b58e79f7c46a15301582c | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Tue Apr 16 15:56:46 2019 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Tue Apr 16 15:56:46 2019 +0200 |
| tree | 79f6972398ca649c4c79689d79c32aeea46fa352 | |
| parent | 07d7e12091f4ab869cc6a4bb276399057e73b0b3 [diff] | |
| parent | 4d86c9f73c5a9a7c3c0661e922509c2c51801671 [diff] |
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)