Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Mon, 22 Feb 2016 18:12:47 +0000 (13:12 -0500)
committerTom Rini <[email protected]>
Mon, 22 Feb 2016 18:12:47 +0000 (13:12 -0500)

Trivial merge