Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Thu, 28 Apr 2016 17:15:41 +0000 (13:15 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 28 Apr 2016 17:15:41 +0000 (13:15 -0400)

Trivial merge