Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 00:48:43 +0000 (20:48 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 00:48:43 +0000 (20:48 -0400)

Trivial merge