]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 019b57c 5287d59)
Merge remote-tracking branch 'u-boot-samsung/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 1 Jul 2014 18:52:51 +0000 (20:52 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 1 Jul 2014 18:52:51 +0000 (20:52 +0200)
commit304f936aeaab0c3cc9d5af438fd3498ac7682991
tree6b50ccc855dff4717749974630d258ba786811d0tree | snapshot
parent019b57cc1d280c3768e2e8a7ff22e07a64c2f670commit | diff
parent5287d595449512385e25f5afcb68a130bf08bae6commit | diff
Merge remote-tracking branch 'u-boot-samsung/master'

Conflicts:
boards.cfg

Conflict was trivial between goni maintainer change and
lager_nor removal.
arch/arm/dts/Makefile diff1 | diff2 | blob | history
boards.cfg diff1 | diff2 | blob | history
Cloned from git://git.denx.de/u-boot.git