Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 2 Jan 2019 00:55:05 +0000 (19:55 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 2 Jan 2019 00:55:05 +0000 (19:55 -0500)

Trivial merge