Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 19:54:09 +0000 (14:54 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 19:54:09 +0000 (14:54 -0500)
commitf1cc97764be4383d2aeb56d5ba5415439a1d5c97
treed6180e4f3d8f91b1c4e2c6b5640be6a1495f67e8
parent2a48b3a2c4ec0f1775deeac5cfe7e61072b6b894
parent9b23bafb4f628aca7a2852f097a7b7da66cac6d8
Merge branch 'master' of git://git.denx.de/u-boot-video