]> git.sur5r.net Git - u-boot/commitdiff
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
include/configs/MPC8548CDS.h

Simple merge
Simple merge