diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 23:11:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 23:11:36 +0100 |
| commit | 4aa364443d023fab08c9dd4fe6785e8b73f6eaeb (patch) | |
| tree | 568ce85c573af7fab4801248b97adaee3f0f7dd5 /drivers/edac | |
| parent | Merge tag 'trace-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rost... (diff) | |
| parent | Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/... (diff) | |
| download | linux-4aa364443d023fab08c9dd4fe6785e8b73f6eaeb.tar.xz linux-4aa364443d023fab08c9dd4fe6785e8b73f6eaeb.zip | |
Merge tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A small set of clockevent fixes which fell through the cracks before
the 5.11 release:
- Ensure a clock is enabled on sh_cmt
- Trivial compile fail and compile warning fixes"
* tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled
clocksource/drivers/ixp4xx: Select TIMER_OF when needed
Diffstat (limited to 'drivers/edac')
0 files changed, 0 insertions, 0 deletions