tree 6b50ccc855dff4717749974630d258ba786811d0
parent 38e93f42cd17a0ba481d44d8b762ea00ca5b0dab
parent 42af4b8ef249679196c79ba065f23744b94b96a7
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1404240771 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1404240771 +0200

Merge remote-tracking branch 'u-boot-samsung/master'

Conflicts:
	boards.cfg

Conflict was trivial between goni maintainer change and
lager_nor removal.