Skip to content
Snippets Groups Projects
Commit 04de09f8 authored by Tom Rini's avatar Tom Rini
Browse files

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: default avatarTom Rini <trini@ti.com>
parents 91693055 2f210639
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1439 additions and 314 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment