Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Tue, 25 Apr 2017 12:59:56 +0000 (08:59 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 25 Apr 2017 12:59:56 +0000 (08:59 -0400)

Trivial merge