Merge remote branch 'u-boot-ppc4xx/master'

author Wolfgang Denk <wd@denx.de>

Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history