Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 16:52:33 +0000 (12:52 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 16:52:33 +0000 (12:52 -0400)

Trivial merge