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

author Wolfgang Denk <wd@denx.de>

Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)
diff --cc README
Simple merge
diff --cc drivers/net/Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history