Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:11:12 +0000 (16:11 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:11:12 +0000 (16:11 -0400)

Trivial merge