Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Wed, 20 Apr 2016 13:23:42 +0000 (09:23 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 20 Apr 2016 13:23:42 +0000 (09:23 -0400)

Trivial merge