| commit | 8acb54abc1db4e1e3913359e4108e04e88ce4d92 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Mon Feb 22 10:59:13 2021 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Mon Feb 22 10:59:13 2021 +0100 |
| tree | 77902ddf57c9d4d7e7e4339d4d6a2028d580e966 | |
| parent | 92bf22614b21a2706f4993b278017e437f7785b3 [diff] | |
| parent | 7da390694afbaed8e0f05717a541dfaf1077ba51 [diff] |
Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent Pull clockevent fixes from Daniel Lezcano - Fix harmless warning with the ixp4xx when the TIMER_OF option is not selected (Arnd Bergmann) - Make sure channel clock supply is enabled on sh_cmt (Geert Uytterhoeven) - Fix compilation error when DEBUG is defined with the mxs_timer (Tom Rix) Link: https://lore.kernel.org/r/ae3bcda6-5180-639d-6246-d2dfd271c3e7@linaro.org