Merge remote-tracking branch 'u-boot-marvell/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 3 Oct 2012 14:44:29 +0000 (16:44 +0200)
1  2 
MAINTAINERS
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge