Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Sat, 2 Dec 2017 00:08:30 +0000 (19:08 -0500)
committerTom Rini <[email protected]>
Sat, 2 Dec 2017 00:08:30 +0000 (19:08 -0500)

Trivial merge