]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9169305 2f21063)
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)
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>

Trivial merge
My U-Boot fork