diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-04-16 15:56:46 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-04-16 15:56:46 +0200 |
commit | 1c09099188501fd9185b58e79f7c46a15301582c (patch) | |
tree | 79f6972398ca649c4c79689d79c32aeea46fa352 /kernel/time/timekeeping.h | |
parent | alarmtimer: Return correct remaining time (diff) | |
parent | clocksource/drivers/timer-ti-dm: Remove omap_dm_timer_set_load_start (diff) | |
download | linux-1c09099188501fd9185b58e79f7c46a15301582c.tar.xz linux-1c09099188501fd9185b58e79f7c46a15301582c.zip |
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)
Diffstat (limited to 'kernel/time/timekeeping.h')
0 files changed, 0 insertions, 0 deletions