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

Merge git://git.denx.de/u-boot-dm 


Conflicts:
	drivers/serial/serial-uclass.c

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents 746667f1 17b28edb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 509 additions and 210 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