Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Fri, 16 Feb 2018 18:55:51 +0000 (13:55 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 16 Feb 2018 18:55:51 +0000 (13:55 -0500)
1  2 
include/configs/socfpga_is1.h
include/configs/socfpga_sr1500.h

Simple merge
Simple merge