| commit | e259cfa2302441e6832bd1d09d8143326fff19fd | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Jun 19 12:53:59 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Jun 19 12:53:59 2013 +0200 |
| tree | 1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d | |
| parent | d81863dbf095a240494426aac8d47245ba251338 [diff] | |
| parent | dc3416a4a2a552ffa212ecac32f2ea73c3f49348 [diff] |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Conflicts: spl/Makefile