Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 11 Sep 2015 17:05:05 +0000 (13:05 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 11 Sep 2015 17:05:05 +0000 (13:05 -0400)

Trivial merge