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)
commit6579d15c58e2b6b051f126ea8b77dd767252aa14
treecac9f9205db8c28a764ad8282d3a909bf95e8db4
parentc44bb3a30f5a1332176edce1a91c0e2cf666ee8f
parent19a0f7fa271de0345bb2df90d443c547c41e8037
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
MAINTAINERS
Makefile
boards.cfg
drivers/mmc/mxsmmc.c
include/configs/apx4devkit.h