projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 14e7a30 29aa439)
Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Mon, 24 Aug 2015 00:44:25 +0000 (20:44 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 24 Aug 2015 00:44:25 +0000 (20:44 -0400)
commitc851a2458fbc12495f4f786d4eabb612850a5143
treefa0b97f9ff8f744db11a1d296283ce7ce335a536tree | snapshot
parent14e7a30f2e8963fc5b91ba68e53bb2de708aee65commit | diff
parent29aa439759ed2e5dfa45cd8d6d5a1d51604e3820commit | 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>
configs/socfpga_arria5_defconfig diff1 | diff2 | blob | history
configs/socfpga_cyclone5_defconfig diff1 | diff2 | blob | history
configs/socfpga_socrates_defconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.