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

author Jon Loeliger <jdl@freescale.com>

Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)

committer Jon Loeliger <jdl@freescale.com>

Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)
author Jon Loeliger <jdl@freescale.com>
Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)
committer Jon Loeliger <jdl@freescale.com>
Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)
diff --cc Makefile
Simple merge
diff --cc include/common.h
Simple merge
diff --cc lib_ppc/board.c
Simple merge
author	Jon Loeliger <jdl@freescale.com>
	Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)
committer	Jon Loeliger <jdl@freescale.com>
	Thu, 19 Oct 2006 17:03:44 +0000 (12:03 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib_ppc/board.c	patch \|	diff1 \|	diff2 \|	blob \| history