diff options
author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
commit | 9e04a8138892d64848dc6e8e74213086d9190d9a (patch) | |
tree | 1740a361891d2390631ec053f1bc42e524913b78 /include/video_logo.h | |
parent | 32c70d3420739930165271d9a1b04572adf799fd (diff) | |
parent | 746c4b9490495dc4381dbcc49f40078d423e0a48 (diff) | |
download | u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.zip u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.gz u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Conflicts:
common/cmd_reginfo.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/video_logo.h')
0 files changed, 0 insertions, 0 deletions