Skip to content
Commit 6aee2ab6 authored by Tom Rini's avatar Tom Rini
Browse files

Merge git://git.denx.de/u-boot-imx 



Signed-off-by: default avatarTom Rini <trini@konsulko.com>

Conflicts:
	configs/imx6qdl_icore_mmc_defconfig
	configs/imx6qdl_icore_rqs_defconfig
parents 4109d702 63af4b0a
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