| commit | 1558797824c0ce136bcedd6a01aff8006b22f35f | [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 | 402e21869c2d8fc8872e3cb00c7c2718a4e1de91 [diff] | |
| parent | af42e2ae16d4ebd55aa55cadaefc46fdc98f37eb [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>