| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 | [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 | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a [diff] | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 [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