Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 30 Apr 2018 10:52:32 +0000 (06:52 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 30 Apr 2018 10:52:32 +0000 (06:52 -0400)

Trivial merge