Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Thu, 10 Jan 2019 14:28:28 +0000 (09:28 -0500)
committerTom Rini <[email protected]>
Thu, 10 Jan 2019 14:28:28 +0000 (09:28 -0500)

Trivial merge