Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga
Fix a trivial conflict in dw_mmc.c after talking with Marek.
Conflicts:
drivers/mmc/dw_mmc.c
Signed-off-by: NTom Rini <trini@ti.com>
Showing
drivers/fpga/socfpga.c
0 → 100644
include/configs/socfpga_common.h
0 → 100644
tools/socfpgaimage.c
0 → 100644
想要评论请 注册 或 登录