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

author Jon Loeliger <jdl@freescale.com>

Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)

committer Jon Loeliger <jdl@freescale.com>

Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
author Jon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
committer Jon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
diff --cc Makefile
Simple merge
diff --cc include/asm-ppc/processor.h
Simple merge
diff --cc net/eth.c
Simple merge
author	Jon Loeliger <jdl@freescale.com>
	Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
committer	Jon Loeliger <jdl@freescale.com>
	Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/processor.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/eth.c	patch \|	diff1 \|	diff2 \|	blob \| history