Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 2 Jul 2016 20:32:15 +0000 (16:32 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 2 Jul 2016 20:32:15 +0000 (16:32 -0400)

Trivial merge