diff options
| author | Tom Rini <trini@ti.com> | 2014-10-06 15:17:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-06 15:17:13 -0400 |
| commit | 04de09f89bbc647d5b72db3512d1af1475a13bbd (patch) | |
| tree | 601e5dbe3def2dee6f7b3dfee680b3aee372d35f /arch/microblaze/Kconfig | |
| parent | 91693055995733e268874ae75568ae316233e116 (diff) | |
| parent | 2f210639c4f003b0d5310273979441f1bfc88eae (diff) | |
| download | talos-obmc-uboot-04de09f89bbc647d5b72db3512d1af1475a13bbd.tar.gz talos-obmc-uboot-04de09f89bbc647d5b72db3512d1af1475a13bbd.zip | |
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>
Diffstat (limited to 'arch/microblaze/Kconfig')
0 files changed, 0 insertions, 0 deletions
