Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/mmc/fsl_esdhc.c
Signed-off-by: NTom Rini <trini@ti.com>
Showing
board/freescale/t208xqds/README
0 → 100755
想要评论请 注册 或 登录
Conflicts:
drivers/mmc/fsl_esdhc.c
Signed-off-by: NTom Rini <trini@ti.com>