Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 22:39:14 +0000 (18:39 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 22:39:14 +0000 (18:39 -0400)

Trivial merge