Merge with /home/tur/git/u-boot#cm5200-si
authorWolfgang Denk <wd@denx.de>
Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
1  2 
MAKEALL
Makefile
cpu/mpc5xxx/fec.c

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Simple merge