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

author Wolfgang Denk <wd@denx.de>

Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)

committer Wolfgang Denk <wd@denx.de>

Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)
author Wolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)
committer Wolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)
diff --cc MAKEALL
Simple merge
diff --cc drivers/net/Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history