]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
1  2 
drivers/mmc/mmc.c
drivers/power/pmic/Makefile
include/configs/mx53evk.h
include/configs/mx53loco.h
include/mmc.h

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc include/mmc.h
Simple merge