| commit | 04de09f89bbc647d5b72db3512d1af1475a13bbd | [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 | 91693055995733e268874ae75568ae316233e116 [diff] | |
| parent | 2f210639c4f003b0d5310273979441f1bfc88eae [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>