Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Tue, 13 Mar 2018 23:00:29 +0000 (19:00 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 13 Mar 2018 23:00:29 +0000 (19:00 -0400)

Trivial merge