]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Mon, 6 Oct 2014 19:17:13 +0000 (15:17 -0400)
committerTom Rini <trini@ti.com>
Mon, 6 Oct 2014 19:17:13 +0000 (15:17 -0400)
commit04de09f89bbc647d5b72db3512d1af1475a13bbd
tree601e5dbe3def2dee6f7b3dfee680b3aee372d35f
parent91693055995733e268874ae75568ae316233e116
parent2f210639c4f003b0d5310273979441f1bfc88eae
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>