Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Sat, 21 Jul 2018 02:35:49 +0000 (22:35 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 21 Jul 2018 02:35:49 +0000 (22:35 -0400)

Trivial merge