Merge branch 'master' into u-boot-5329-early

author John Rigby <jrigby@freescale.com>

Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)

committer John Rigby <jrigby@freescale.com>

Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)
author John Rigby <jrigby@freescale.com>
Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)
committer John Rigby <jrigby@freescale.com>
Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc net/eth.c
Simple merge
author	John Rigby <jrigby@freescale.com>
	Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)
committer	John Rigby <jrigby@freescale.com>
	Tue, 10 Jul 2007 20:58:41 +0000 (14:58 -0600)
		1	2
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