Merge with http://opensource.freescale.com/pub/scm/u-boot-83xx.git

author Wolfgang Denk <wd@pollux.denx.de>

Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)

committer Wolfgang Denk <wd@denx.de>

Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)
author Wolfgang Denk <wd@pollux.denx.de>
Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)
committer Wolfgang Denk <wd@denx.de>
Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/nand/nand_base.c
Simple merge
diff --cc net/eth.c
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 30 Nov 2006 01:01:32 +0000 (02:01 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_base.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/eth.c	patch \|	diff1 \|	diff2 \|	blob \| history