projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fa4802 47a6989)
Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 15:08:31 +0000 (17:08 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 15:08:31 +0000 (17:08 +0200)
(Conflicts between Jon Loeliger's and Matthew McClintock's tree
 were resolved by in favour of Jon's version.)

1  2 
common/cmd_bootm.c patch | diff1 | diff2 | blob | history
include/configs/MPC8548CDS.h patch | diff1 | diff2 | blob | history

diff --cc common/cmd_bootm.c
Simple merge
diff --cc include/configs/MPC8548CDS.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.