diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 20:55:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 20:55:43 +0100 |
| commit | 3f6ec19f2d05d800bbc42d95dece433da7697864 (patch) | |
| tree | 5b863cbf7f1e0be1bd8405ff2641cc83f0d29f3b /kernel/time/ntp.c | |
| parent | Merge tag 'irq-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge tag 'timers-v5.12-rc1' of https://git.linaro.org/people/daniel.lezcano/... (diff) | |
| download | linux-3f6ec19f2d05d800bbc42d95dece433da7697864.tar.xz linux-3f6ec19f2d05d800bbc42d95dece433da7697864.zip | |
Merge tag 'timers-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner:
"Time and timer updates:
- Instead of new drivers remove tango, sirf, u300 and atlas drivers
- Add suspend/resume support for microchip pit64b
- The usual fixes, improvements and cleanups here and there"
* tag 'timers-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timens: Delete no-op time_ns_init()
alarmtimer: Update kerneldoc
clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume
clocksource/drivers/prima: Remove sirf prima driver
clocksource/drivers/atlas: Remove sirf atlas driver
clocksource/drivers/tango: Remove tango driver
clocksource/drivers/u300: Remove the u300 driver
dt-bindings: timer: nuvoton: Clarify that interrupt of timer 0 should be specified
clocksource/drivers/davinci: Move pr_fmt() before the includes
clocksource/drivers/efm32: Drop unused timer code
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions