Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Mon, 1 Aug 2016 00:31:13 +0000 (20:31 -0400)
committerTom Rini <[email protected]>
Mon, 1 Aug 2016 00:31:13 +0000 (20:31 -0400)

Trivial merge