Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Sun, 10 Apr 2016 23:55:25 +0000 (19:55 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 10 Apr 2016 23:55:25 +0000 (19:55 -0400)

Trivial merge