Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 29 Oct 2018 15:21:00 +0000 (11:21 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 29 Oct 2018 15:21:00 +0000 (11:21 -0400)

Trivial merge