]> 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>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
1  2 
MAINTAINERS
boards.cfg
drivers/spi/mxc_spi.c

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