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

author Wolfgang Denk <wd@denx.de>

Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)

committer Wolfgang Denk <wd@denx.de>

Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)
author Wolfgang Denk <wd@denx.de>
Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)
committer Wolfgang Denk <wd@denx.de>
Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 24 Jan 2009 01:17:02 +0000 (02:17 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history