Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Thu, 26 Oct 2017 15:50:33 +0000 (11:50 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 26 Oct 2017 15:50:33 +0000 (11:50 -0400)

Trivial merge