Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:46 +0000 (08:30 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:46 +0000 (08:30 -0400)

Trivial merge