Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 25 May 2016 16:32:56 +0000 (12:32 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 25 May 2016 16:32:56 +0000 (12:32 -0400)

Trivial merge