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

author Wolfgang Denk <wd@denx.de>

Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)

committer Wolfgang Denk <wd@denx.de>

Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
author Wolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
committer Wolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history