Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 13 Jan 2017 02:20:51 +0000 (21:20 -0500)
committerTom Rini <[email protected]>
Fri, 13 Jan 2017 02:20:51 +0000 (21:20 -0500)

Trivial merge