Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Wed, 3 Jan 2018 17:27:12 +0000 (12:27 -0500)
committerTom Rini <[email protected]>
Wed, 3 Jan 2018 17:27:12 +0000 (12:27 -0500)

Trivial merge