Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:10:54 +0000 (16:10 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:10:54 +0000 (16:10 -0400)

Trivial merge