diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 15:41:54 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 15:41:54 (GMT) |
| commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e (patch) | |
| tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe /arch/arm/cpu | |
| parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff) | |
| parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff) | |
| download | u-boot-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts:
include/splash.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu')
0 files changed, 0 insertions, 0 deletions