Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Mon, 7 Sep 2015 12:56:08 +0000 (08:56 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 7 Sep 2015 12:56:08 +0000 (08:56 -0400)

Trivial merge