Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 03:04:32 +0000 (22:04 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 03:04:32 +0000 (22:04 -0500)

Trivial merge