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)
commitd167dd4883406ca852b1a2e75db5553279815f62
treee8ba75857253f05502b7ee144922338c8c0dc8f3
parent46caea7f96f0cd81cbc92fefc3d279e870442cb0
parentf777df3628c544d2f982cbb631fbd053f4072955
Merge branch 'master' of git://git.denx.de/u-boot-rockchip