Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Sat, 23 Sep 2017 21:32:53 +0000 (17:32 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 23 Sep 2017 21:32:53 +0000 (17:32 -0400)

Trivial merge