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

author Wolfgang Denk <wd@denx.de>

Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)

committer Wolfgang Denk <wd@denx.de>

Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)
author Wolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)
committer Wolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)
diff --cc Makefile
Simple merge
diff --cc cpu/ppc4xx/start.S
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 14 Feb 2008 23:22:37 +0000 (00:22 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/start.S	patch \|	diff1 \|	diff2 \|	blob \| history