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

Trivial merge