Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Mon, 18 Dec 2017 23:39:18 +0000 (18:39 -0500)
committerTom Rini <[email protected]>
Mon, 18 Dec 2017 23:39:18 +0000 (18:39 -0500)

Trivial merge