projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07d7e12
4d86c9f
)
Merge tag 'timers-v5.1-rc6' of https://git.linaro.org/people/daniel.lezcano/linux...
author
Thomas Gleixner
<tglx@linutronix.de>
Tue, 16 Apr 2019 13:56:46 +0000
(15:56 +0200)
committer
Thomas Gleixner
<tglx@linutronix.de>
Tue, 16 Apr 2019 13:56:46 +0000
(15:56 +0200)
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)
Trivial merge