Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 29 Nov 2018 21:36:53 +0000 (16:36 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 29 Nov 2018 21:36:53 +0000 (16:36 -0500)

Trivial merge