Skip to content
Commit 1cad23c5 authored by Stefano Babic's avatar Stefano Babic
Browse files

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



Conflicts:
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: default avatarStefano Babic <sbabic@denx.de>
parents 5dd73bc0 00b132bf
Hide whitespace changes
Inline Side-by-side
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