Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 29 Sep 2018 15:48:02 +0000 (11:48 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 29 Sep 2018 15:48:02 +0000 (11:48 -0400)

Trivial merge