Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Thu, 5 Nov 2015 12:47:21 +0000 (07:47 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 5 Nov 2015 12:47:21 +0000 (07:47 -0500)

Trivial merge