Tom Rini 04de09f89b 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>
2014-10-06 15:17:13 -04:00
..
2014-10-06 17:34:39 +02:00
2014-09-24 18:30:28 -04:00
2014-08-01 19:24:34 +03:00
2014-10-03 17:26:50 +03:00
2014-10-03 17:26:50 +03:00
2014-08-01 19:24:34 +03:00
2014-07-06 20:12:44 +01:00