Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Mon, 17 Apr 2017 02:08:13 +0000 (22:08 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 17 Apr 2017 02:08:13 +0000 (22:08 -0400)

Trivial merge