Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 18 Sep 2016 16:11:50 +0000 (12:11 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 18 Sep 2016 18:05:29 +0000 (14:05 -0400)

Trivial merge