Skip to content
Commit 21008ad6 authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx 



Conflicts:
	drivers/mmc/fsl_esdhc.c

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents d3e488ea 3b4b9a33
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment