Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Thu, 9 Dec 2021 13:43:30 +0000 (08:43 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 9 Dec 2021 13:43:30 +0000 (08:43 -0500)
commit1530ad5becf330c6094e995e340d920df2b43699
treec8757eb5ff74c48de9802e48474555da08535145
parent558002a0f2230bedf6b38716f3ed86a92fc9010b
parentfbd9207e7fe3712b372ca9889a2a82402161fd27
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi

This fixes two regressions: eMMC operation on boards with WiFi (so using
three MMC devices), and a repeated wrong error message in USB gadget
mode (fastboot, ums).