]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Sun, 30 Aug 2015 23:48:39 +0000 (19:48 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 30 Aug 2015 23:48:39 +0000 (19:48 -0400)

Trivial merge