projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd97370feca2a589dad42154577bb4615a0347852
tree5a3f85d24e07425977b7019017ae1615c0f12ce7tree | snapshot
parent9fa48022e5883a0826a98979c0156f6ac5a0ef79commit | diff
parent47a6989c10685d2ab3efcf95228ce50d2a496d3ecommit | diff
Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree
 were resolved by in favour of Jon's version.)
common/cmd_bootm.c diff1 | diff2 | blob | history
include/configs/MPC8548CDS.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.