Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Tue, 28 Nov 2017 14:30:36 +0000 (09:30 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 28 Nov 2017 14:30:36 +0000 (09:30 -0500)

Trivial merge