Merge branch 'next' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Wed, 14 Jan 2015 21:26:15 +0000 (16:26 -0500)
committerTom Rini <trini@ti.com>
Wed, 14 Jan 2015 21:26:15 +0000 (16:26 -0500)

Trivial merge