Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 18 May 2017 21:17:42 +0000 (17:17 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 18 May 2017 21:17:42 +0000 (17:17 -0400)

Trivial merge