Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Wed, 16 Dec 2015 19:50:03 +0000 (14:50 -0500)
committerTom Rini <[email protected]>
Wed, 16 Dec 2015 19:50:03 +0000 (14:50 -0500)

Trivial merge