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

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



Conflicts:
	drivers/serial/serial_lh7a40x.c

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents 7f14f30a 39826f09
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