Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Mon, 1 Jan 2018 14:04:35 +0000 (09:04 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 1 Jan 2018 14:04:35 +0000 (09:04 -0500)

Trivial merge