Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Jun 2013 10:53:59 +0000 (12:53 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Jun 2013 10:53:59 +0000 (12:53 +0200)
commit69f14dc2fd64307f012381dd333a06001dec75dc
tree1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d
parent847e6693ccb529bf8346db62876f38f0c4e04ade
parented7bdc03eb516fb698ccc12ec5b4b9f132d05c5f
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
spl/Makefile
drivers/mmc/mmc.c
include/mmc.h
spl/Makefile