Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 8 Dec 2017 14:32:10 +0000 (09:32 -0500)
committerTom Rini <[email protected]>
Fri, 8 Dec 2017 14:32:10 +0000 (09:32 -0500)

Trivial merge