| commit | d77fa2ff766bbb4b867e791187f78b6033071613 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Mon Jun 06 13:24:23 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Mon Jun 06 13:39:43 2016 -0400 |
| tree | b1116470884e46c0a66c49525771cf9b49c3835d | |
| parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 [diff] | |
| parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 [diff] |
Merge http://git.denx.de/u-boot-samsung Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/peach-pi_defconfig configs/peach-pit_defconfig