Skip to content
Commit fc9b0b80 authored by Tom Rini's avatar Tom Rini
Browse files

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



Conflicts:
	board/freescale/mx6sxsabresd/mx6sxsabresd.c

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents 2c49323d 0c6de885
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