Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Thu, 26 Apr 2018 11:21:41 +0000 (07:21 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 26 Apr 2018 11:21:41 +0000 (07:21 -0400)

Trivial merge