Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

author Wolfgang Denk <wd@denx.de>

Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)

committer Wolfgang Denk <wd@denx.de>

Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
author Wolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
committer Wolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc net/eth.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
net/eth.c	patch \|	diff1 \|	diff2 \|	blob \| history