tree 35b590b7fa99f65de5b44efa9e208af58dfa028d
parent e1f3dae9ec9472fbcdebd719d7f2972f0b4ed52f
parent 09ae491925a0ec7e614943f1355051eee78f1ef7
author Tom Rini <trini@konsulko.com> 1558374831 -0400
committer Tom Rini <trini@konsulko.com> 1558374831 -0400

Merge branch 'master' of git://git.denx.de/u-boot-sunxi

- H6 WDT reset fix (Clément)
- H6 SPL_TEXT_BASE fixes (Clément, Jonas)
- NPI-M1+ emac enablment (Emmanuel)