Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
1  2 
MAINTAINERS
Makefile
boards.cfg
drivers/mmc/mxsmmc.c
include/configs/apx4devkit.h

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