Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Sat, 6 Aug 2016 15:38:14 +0000 (11:38 -0400)
committerTom Rini <[email protected]>
Sat, 6 Aug 2016 15:38:14 +0000 (11:38 -0400)

Trivial merge