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

author Wolfgang Denk <wd@denx.de>

Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)

committer Wolfgang Denk <wd@denx.de>

Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
author Wolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
committer Wolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history