Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 10 Jun 2015 14:55:49 +0000 (10:55 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 10 Jun 2015 14:55:49 +0000 (10:55 -0400)

Trivial merge