tree a97493753a119e577161a4fb0b40b8edfc3923bb
parent a4283bc9a5b08d891d353e991767cf75870692da
parent 84640e82ea5145b1e0077770bfe826368181b788
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1395739514 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1395741195 +0100

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c