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

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


Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents 65b7fe28 f15ea6e1
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 571 additions and 70 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