Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale
authorStefan Roese <sr@denx.de>
Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
committerStefan Roese <sr@denx.de>
Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
1  2 
MAKEALL
Makefile
net/eth.c

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc net/eth.c
Simple merge