Skip to content
Snippets Groups Projects
Commit a10a31ec authored by Tom Rini's avatar Tom Rini
Browse files

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


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

Conflicts:
	arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
parents 2372b001 1e6fb0e3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 333 additions and 233 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