| commit | 700dc652a1c65ba56f82f67a4d32a596c5f56605 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Oct 06 15:17:13 2014 -0400 |
| committer | Tom Rini <trini@ti.com> | Mon Oct 06 15:17:13 2014 -0400 |
| tree | 601e5dbe3def2dee6f7b3dfee680b3aee372d35f | |
| parent | 9e2712d4ac062cc6d70b214ac4d5bec86bd2f905 [diff] | |
| parent | 08c71a6997a9aadc466e3edd8d8182b7773d1b0c [diff] |
Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga Fix a trivial conflict in dw_mmc.c after talking with Marek. Conflicts: drivers/mmc/dw_mmc.c Signed-off-by: Tom Rini <trini@ti.com>