Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 4 Aug 2018 23:41:30 +0000 (19:41 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 4 Aug 2018 23:41:30 +0000 (19:41 -0400)

Trivial merge