diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 14:11:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 14:11:36 -0800 |
commit | 4aa364443d023fab08c9dd4fe6785e8b73f6eaeb (patch) | |
tree | 568ce85c573af7fab4801248b97adaee3f0f7dd5 /mm | |
parent | c9584234709aff90fbf38f71904a068ee9e8bce3 (diff) | |
parent | 8acb54abc1db4e1e3913359e4108e04e88ce4d92 (diff) | |
download | linux-stable-4aa364443d023fab08c9dd4fe6785e8b73f6eaeb.tar.gz linux-stable-4aa364443d023fab08c9dd4fe6785e8b73f6eaeb.tar.bz2 linux-stable-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 'mm')
0 files changed, 0 insertions, 0 deletions