Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 1 Apr 2016 12:17:55 +0000 (08:17 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Apr 2016 12:17:55 +0000 (08:17 -0400)

Trivial merge