Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Sun, 20 Mar 2016 22:09:34 +0000 (18:09 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 20 Mar 2016 22:09:34 +0000 (18:09 -0400)

Trivial merge