Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Tue, 5 Sep 2017 11:11:46 +0000 (07:11 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 5 Sep 2017 11:11:46 +0000 (07:11 -0400)

Trivial merge