Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
committerStefano Babic <sbabic@denx.de>
Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
1  2 
README
arch/arm/Kconfig
drivers/mmc/fsl_esdhc.c
include/fsl_esdhc.h
include/mmc.h

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