Merge remote-tracking branch 'u-boot-marvell/master'

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history