Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:41:54 +0000 (10:41 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:41:54 +0000 (10:41 -0500)
commit0dac731d1932027f4f813ec7aede35d5e30dec0e
tree522a20ea29730f0b5be03c8ced3b16a37fc165fe
parent307367eaffc8638e10ba1784fc66bfe623ae79e2
parent7bf71d1f55d31a81ade8dd0fc72f06e4672689d0
Merge branch 'master' of git://git.denx.de/u-boot-video

Conflicts:
include/splash.h

Signed-off-by: Tom Rini <trini@ti.com>
common/Makefile
include/splash.h