Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 25 Jul 2015 13:04:18 +0000 (09:04 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 25 Jul 2015 13:04:18 +0000 (09:04 -0400)

Trivial merge