Merge git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 13:56:34 +0000 (09:56 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 13:56:34 +0000 (09:56 -0400)
commit50905b55c7b9c3a20e2c5a7e5f7ae8236ecd7a8e
treef60600eb76b6372342c38a35a2802be124505b58
parentb8aa55cb6414e512cce30bb7db3268eea934466d
parentcc1b0e7b8e55bbcb1ba7dbf1109a1556e00eefc0
Merge git://git.denx.de/u-boot-video