Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:31:07 +0000 (10:31 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:31:07 +0000 (10:31 -0400)

Trivial merge