| commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Tue Feb 10 10:41:54 2015 -0500 |
| committer | Tom Rini <trini@ti.com> | Tue Feb 10 10:41:54 2015 -0500 |
| tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe | |
| parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 [diff] | |
| parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-video Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>