Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale

author Stefan Roese <sr@denx.de>

Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)

committer Stefan Roese <sr@denx.de>

Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
author Stefan Roese <sr@denx.de>
Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
committer Stefan Roese <sr@denx.de>
Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc net/eth.c
Simple merge
author	Stefan Roese <sr@denx.de>
	Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
committer	Stefan Roese <sr@denx.de>
	Mon, 16 Jul 2007 09:51:41 +0000 (11:51 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
net/eth.c	patch \|	diff1 \|	diff2 \|	blob \| history