From: Tom Rini Date: Mon, 6 Oct 2014 19:17:13 +0000 (-0400) Subject: Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=04de09f89bbc647d5b72db3512d1af1475a13bbd;p=u-boot.git 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 --- 04de09f89bbc647d5b72db3512d1af1475a13bbd