tree 601e5dbe3def2dee6f7b3dfee680b3aee372d35f
parent 91693055995733e268874ae75568ae316233e116
parent 2f210639c4f003b0d5310273979441f1bfc88eae
author Tom Rini <trini@ti.com> 1412623033 -0400
committer Tom Rini <trini@ti.com> 1412623033 -0400

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>