Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 8 Jan 2016 19:19:24 +0000 (14:19 -0500)
committerTom Rini <[email protected]>
Fri, 8 Jan 2016 19:19:24 +0000 (14:19 -0500)

Trivial merge