]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)

Trivial merge