| commit | 5f0e674052109a0d500fd64fa5c284586dc40a52 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Mar 25 10:25:14 2014 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Mar 25 10:53:15 2014 +0100 |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb | |
| parent | a4283bc9a5b08d891d353e991767cf75870692da [diff] | |
| parent | 84640e82ea5145b1e0077770bfe826368181b788 [diff] |
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