Merge commit 'ef5ba2cef4a08b68caaa9215fcac142d3025bbf7' of https://github.com/tienfon...
authorTom Rini <trini@konsulko.com>
Fri, 1 Jul 2022 13:14:32 +0000 (09:14 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jul 2022 13:14:32 +0000 (09:14 -0400)

Trivial merge