Skip to content
Snippets Groups Projects
Commit 519fdde9 authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

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

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	include/configs/trats.h
	include/configs/trats2.h
	include/mmc.h
parents c71645ad 04d2f0a9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 333 deletions
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