Commits
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx Conflicts: drivers/mmc/fsl_esdhc.c Signed-off-by: Tom Rini <trini@ti.com>
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx Conflicts: drivers/mmc/fsl_esdhc.c Signed-off-by: Tom Rini <trini@ti.com>