]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
1  2 
MAINTAINERS
boards.cfg

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