Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Thu, 11 Feb 2016 23:18:15 +0000 (18:18 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 11 Feb 2016 23:18:15 +0000 (18:18 -0500)
commit9ef2835f26652092a61b0cb0551ef4f36be27946
tree6bba2498b2364342cdfc02789efad167b72d4c50
parentcc8d698fabf072f49ef4dfb2cfdbe0f57d54af81
parent6c88b51305d69b9728c56f27f363530a7f3d7e83
Merge branch 'master' of git://git.denx.de/u-boot-video