Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 4 Feb 2016 11:56:20 +0000 (06:56 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 4 Feb 2016 11:56:20 +0000 (06:56 -0500)

Trivial merge