Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 1 Mar 2018 20:50:52 +0000 (15:50 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 1 Mar 2018 20:50:52 +0000 (15:50 -0500)

Trivial merge