Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Tue, 15 Mar 2016 12:01:17 +0000 (08:01 -0400)
committerTom Rini <[email protected]>
Tue, 15 Mar 2016 12:01:17 +0000 (08:01 -0400)

Trivial merge