| commit | 459316b119be980c63a341495f5f525434b94b44 | [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 | 6bfc15aaf762440ae9ab0571624025d4baec43f4 [diff] | |
| parent | 1ae13d3c9d8995c813122dcebb37fca4230f9dec [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-video Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>