Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Tue, 10 Jan 2017 13:19:21 +0000 (08:19 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 10 Jan 2017 13:19:21 +0000 (08:19 -0500)

Trivial merge