Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Wed, 26 Nov 2014 16:22:29 +0000 (11:22 -0500)
committerTom Rini <trini@ti.com>
Wed, 26 Nov 2014 16:22:29 +0000 (11:22 -0500)
commit21008ad6384170767041f1608975473c5ffa7fc7
treeeb00c0fb9650e14ba768d720c057373d9ea59451
parentd3e488eaf48c49980adb8509a76f8577b1cf2599
parent3b4b9a3377d6e7cba6060497b02644f9ff2ac67a
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>
drivers/mmc/fsl_esdhc.c