]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 92bf226 7da3906)
Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 22 Feb 2021 09:59:13 +0000 (10:59 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 22 Feb 2021 09:59:13 +0000 (10:59 +0100)
commit8acb54abc1db4e1e3913359e4108e04e88ce4d92
tree77902ddf57c9d4d7e7e4339d4d6a2028d580e966tree
parent92bf22614b21a2706f4993b278017e437f7785b3commit | diff
parent7da390694afbaed8e0f05717a541dfaf1077ba51commit | 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
Unnamed repository; edit this file 'description' to name the repository.