Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 9 Aug 2015 00:20:17 +0000 (20:20 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 9 Aug 2015 00:20:17 +0000 (20:20 -0400)

Trivial merge