diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-24 00:44:25 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-24 00:44:25 (GMT) |
| commit | c851a2458fbc12495f4f786d4eabb612850a5143 (patch) | |
| tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 /include/configs/colibri_pxa270.h | |
| parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (diff) | |
| parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 (diff) | |
| download | u-boot-c851a2458fbc12495f4f786d4eabb612850a5143.tar.xz | |
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>
Diffstat (limited to 'include/configs/colibri_pxa270.h')
0 files changed, 0 insertions, 0 deletions