| commit | c851a2458fbc12495f4f786d4eabb612850a5143 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sun Aug 23 20:44:25 2015 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Sun Aug 23 20:44:25 2015 -0400 |
| tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 | |
| parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 [diff] | |
| parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 [diff] |
Merge git://git.denx.de/u-boot-socfpga Conflicts: configs/socfpga_arria5_defconfig configs/socfpga_cyclone5_defconfig configs/socfpga_socrates_defconfig Merged these by hand and re-ran savedefconfig on them. Signed-off-by: Tom Rini <trini@konsulko.com>