Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Tue, 9 Jan 2018 18:28:51 +0000 (13:28 -0500)
committerTom Rini <[email protected]>
Tue, 9 Jan 2018 18:28:51 +0000 (13:28 -0500)

Trivial merge