From: Tom Rini <trini@konsulko.com>
Date: Fri, 23 Oct 2020 00:32:02 +0000 (-0400)
Subject: Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
X-Git-Tag: v2025.01-rc5-pxa1908~2164
X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B%20%24.Site.BaseURL%20%7D%7Dposts/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=commitdiff_plain;h=18261b8552232e342709e69eadec33090a7f04e4;p=u-boot.git

Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi

- sun8i emac changes (Andre)
- SCP firmware (Samuel)
---

18261b8552232e342709e69eadec33090a7f04e4