Skip to content
Commit ec7023db authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 

Conflicts:
	drivers/mtd/nand/mxc_nand_spl.c
	include/configs/m28evk.h
parents e825b100 d782c1fe
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment