Commits
Merge branch 'master' of git://git.denx.de/u-boot-video Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>
Merge branch 'master' of git://git.denx.de/u-boot-video Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>