| commit | 21008ad6384170767041f1608975473c5ffa7fc7 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Nov 26 11:22:29 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Wed Nov 26 11:22:29 2014 -0500 |
| tree | eb00c0fb9650e14ba768d720c057373d9ea59451 | |
| parent | d3e488eaf48c49980adb8509a76f8577b1cf2599 [diff] | |
| parent | 3b4b9a3377d6e7cba6060497b02644f9ff2ac67a [diff] |
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>