]> git.sur5r.net Git - u-boot/commitdiff
Merge with /home/tur/git/u-boot#motionpro
authorWolfgang Denk <wd@denx.de>
Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
1  2 
board/motionpro/motionpro.c
common/main.c
cpu/mpc5xxx/fec.c
include/configs/IceCube.h
include/configs/hmi1001.h
include/configs/mcc200.h

Simple merge
diff --cc common/main.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge