Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Sun, 26 Nov 2017 23:10:21 +0000 (18:10 -0500)
committerTom Rini <[email protected]>
Sun, 26 Nov 2017 23:10:21 +0000 (18:10 -0500)

Trivial merge