Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 18:58:52 +0000 (14:58 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 21:05:01 +0000 (17:05 -0400)

Trivial merge