Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing
with 150 additions and 153 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment