Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Mon, 14 May 2018 22:13:59 +0000 (18:13 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 14 May 2018 22:13:59 +0000 (18:13 -0400)

Trivial merge