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

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


Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents d72da158 efc284e3
No related branches found
No related tags found
Loading
Showing
with 908 additions and 293 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment