| commit | 2907a308e9519cd17301fdd8d74fe5a2a78642b1 | [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 | 8a3aeaf2e9e3f8444123124e697527481ec6daa7 [diff] | |
| parent | 2d46589cf00bae2a1dcda741f2bcffd1b8c70550 [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>